hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/atm/iphase.c
....@@ -2771,12 +2771,6 @@
27712771 case MEMDUMP:
27722772 {
27732773 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;
27802774 case MEMDUMP_SEGREG:
27812775 if (!capable(CAP_NET_ADMIN)) return -EPERM;
27822776 tmps = (u16 __user *)ia_cmds.buf;
....@@ -2830,8 +2824,8 @@
28302824 case 0x6:
28312825 {
28322826 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));
28352829 }
28362830 break;
28372831 case 0x8:
....@@ -2884,20 +2878,6 @@
28842878
28852879 }
28862880 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;
29012881 }
29022882
29032883 static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
....@@ -3170,8 +3150,6 @@
31703150 .open = ia_open,
31713151 .close = ia_close,
31723152 .ioctl = ia_ioctl,
3173
- .getsockopt = ia_getsockopt,
3174
- .setsockopt = ia_setsockopt,
31753153 .send = ia_send,
31763154 .phy_put = ia_phy_put,
31773155 .phy_get = ia_phy_get,