write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/atm/iphase.c
..
..
@@ -2771,12 +2771,6 @@
2771
2771
    case MEMDUMP:
2772
2772
    {
2773
2773
 	switch (ia_cmds.sub_cmd) {
2774
-       	  case MEMDUMP_DEV:     
2775
-	     if (!capable(CAP_NET_ADMIN)) return -EPERM;
2776
-	     if (copy_to_user(ia_cmds.buf, iadev, sizeof(IADEV)))
2777
-                return -EFAULT;
2778
-             ia_cmds.status = 0;
2779
-             break;
2780
2774
           case MEMDUMP_SEGREG:
2781
2775
 	     if (!capable(CAP_NET_ADMIN)) return -EPERM;
2782
2776
              tmps = (u16 __user *)ia_cmds.buf;
..
..
@@ -2830,8 +2824,8 @@
2830
2824
          case 0x6:
2831
2825
          {  
2832
2826
              ia_cmds.status = 0; 
2833
-             printk("skb = 0x%lx\n", (long)skb_peek(&iadev->tx_backlog));
2834
-             printk("rtn_q: 0x%lx\n",(long)ia_deque_rtn_q(&iadev->tx_return_q));
2827
+             printk("skb = 0x%p\n", skb_peek(&iadev->tx_backlog));
2828
+             printk("rtn_q: 0x%p\n",ia_deque_rtn_q(&iadev->tx_return_q));
2835
2829
          }
2836
2830
              break;
2837
2831
          case 0x8:
..
..
@@ -2884,20 +2878,6 @@
2884
2878
 
2885
2879
    }	
2886
2880
    return 0;  
2887
-}  
2888
-  
2889
-static int ia_getsockopt(struct atm_vcc *vcc, int level, int optname,   
2890
-	void __user *optval, int optlen)  
2891
-{  
2892
-	IF_EVENT(printk(">ia_getsockopt\n");)  
2893
-	return -EINVAL;  
2894
-}  
2895
-  
2896
-static int ia_setsockopt(struct atm_vcc *vcc, int level, int optname,   
2897
-	void __user *optval, unsigned int optlen)  
2898
-{  
2899
-	IF_EVENT(printk(">ia_setsockopt\n");)  
2900
-	return -EINVAL;  
2901
2881
 }  
2902
2882
   
2903
2883
 static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
..
..
@@ -3170,8 +3150,6 @@
3170
3150
 	.open		= ia_open,  
3171
3151
 	.close		= ia_close,  
3172
3152
 	.ioctl		= ia_ioctl,  
3173
-	.getsockopt	= ia_getsockopt,  
3174
-	.setsockopt	= ia_setsockopt,  
3175
3153
 	.send		= ia_send,  
3176
3154
 	.phy_put	= ia_phy_put,  
3177
3155
 	.phy_get	= ia_phy_get,