History

net/atm: remove the atmdev_ops {get, set}sockopt methods

All implementations of these two methods are dummies that always return -EINVAL.

Christoph Hellwig committed 6 years ago

Commit a06d30a1 parent 089377b10 files · +2 −143Browse files

Unified · Split

10 files
  1. drivers/atm/eni.c +0 −17
  2. drivers/atm/firestream.c +0 −2
  3. drivers/atm/fore200e.c +0 −27
  4. drivers/atm/horizon.c +0 −40
  5. drivers/atm/iphase.c +0 −16
  6. drivers/atm/lanai.c +0 −2
  7. drivers/atm/solos-pci.c +0 −2
  8. drivers/atm/zatm.c +0 −16
  9. include/linux/atmdev.h +0 −9
  10. net/atm/common.c +2 −12
drivers/atm/eni.c+0−17
@@ -2027,21 +2027,6 @@ static int eni_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg) · 2026 unmodified lines
20272027 return dev->phy->ioctl(dev,cmd,arg);
20282028 }
20292029
2030−
2031−static int eni_getsockopt(struct atm_vcc *vcc,int level,int optname,
2032− void __user *optval,int optlen)
2033−{
2034− return -EINVAL;
2035−}
2036−
2037−
2038−static int eni_setsockopt(struct atm_vcc *vcc,int level,int optname,
2039− void __user *optval,unsigned int optlen)
2040−{
2041− return -EINVAL;
2042−}
2043−
2044−
20452030 static int eni_send(struct atm_vcc *vcc,struct sk_buff *skb)
20462031 {
20472032 enum enq_res res;
@@ -2215,8 +2200,6 @@ static const struct atmdev_ops ops = { · 167 unmodified lines
22152200 .open = eni_open,
22162201 .close = eni_close,
22172202 .ioctl = eni_ioctl,
2218− .getsockopt = eni_getsockopt,
2219− .setsockopt = eni_setsockopt,
22202203 .send = eni_send,
22212204 .phy_put = eni_phy_put,
22222205 .phy_get = eni_phy_get,
drivers/atm/firestream.c+0−2
@@ -1277,8 +1277,6 @@ static const struct atmdev_ops ops = { · 1276 unmodified lines
12771277 .send = fs_send,
12781278 .owner = THIS_MODULE,
12791279 /* ioctl: fs_ioctl, */
1280− /* getsockopt: fs_getsockopt, */
1281− /* setsockopt: fs_setsockopt, */
12821280 /* change_qos: fs_change_qos, */
12831281
12841282 /* For now implement these internally here... */
drivers/atm/fore200e.c+0−27
@@ -1710,31 +1710,6 @@ fore200e_getstats(struct fore200e* fore200e) · 1709 unmodified lines
17101710 return 0;
17111711 }
17121712
1713−
1714−static int
1715−fore200e_getsockopt(struct atm_vcc* vcc, int level, int optname, void __user *optval, int optlen)
1716−{
1717− /* struct fore200e* fore200e = FORE200E_DEV(vcc->dev); */
1718−
1719− DPRINTK(2, "getsockopt %d.%d.%d, level = %d, optname = 0x%x, optval = 0x%p, optlen = %d\n",
1720− vcc->itf, vcc->vpi, vcc->vci, level, optname, optval, optlen);
1721−
1722− return -EINVAL;
1723−}
1724−
1725−
1726−static int
1727−fore200e_setsockopt(struct atm_vcc* vcc, int level, int optname, void __user *optval, unsigned int optlen)
1728−{
1729− /* struct fore200e* fore200e = FORE200E_DEV(vcc->dev); */
1730−
1731− DPRINTK(2, "setsockopt %d.%d.%d, level = %d, optname = 0x%x, optval = 0x%p, optlen = %d\n",
1732− vcc->itf, vcc->vpi, vcc->vci, level, optname, optval, optlen);
1733−
1734− return -EINVAL;
1735−}
1736−
1737−
17381713 #if 0 /* currently unused */
17391714 static int
17401715 fore200e_get_oc3(struct fore200e* fore200e, struct oc3_regs* regs)
@@ -3026,8 +3001,6 @@ static const struct atmdev_ops fore200e_ops = { · 1285 unmodified lines
30263001 .open = fore200e_open,
30273002 .close = fore200e_close,
30283003 .ioctl = fore200e_ioctl,
3029− .getsockopt = fore200e_getsockopt,
3030− .setsockopt = fore200e_setsockopt,
30313004 .send = fore200e_send,
30323005 .change_qos = fore200e_change_qos,
30333006 .proc_read = fore200e_proc_read,
drivers/atm/horizon.c+0−40
@@ -2527,46 +2527,6 @@ static void hrz_close (struct atm_vcc * atm_vcc) { · 2526 unmodified lines
25272527 clear_bit(ATM_VF_ADDR,&atm_vcc->flags);
25282528 }
25292529
2530−#if 0
2531−static int hrz_getsockopt (struct atm_vcc * atm_vcc, int level, int optname,
2532− void *optval, int optlen) {
2533− hrz_dev * dev = HRZ_DEV(atm_vcc->dev);
2534− PRINTD (DBG_FLOW|DBG_VCC, "hrz_getsockopt");
2535− switch (level) {
2536− case SOL_SOCKET:
2537− switch (optname) {
2538−// case SO_BCTXOPT:
2539−// break;
2540−// case SO_BCRXOPT:
2541−// break;
2542− default:
2543− return -ENOPROTOOPT;
2544− };
2545− break;
2546− }
2547− return -EINVAL;
2548−}
2549−
2550−static int hrz_setsockopt (struct atm_vcc * atm_vcc, int level, int optname,
2551− void *optval, unsigned int optlen) {
2552− hrz_dev * dev = HRZ_DEV(atm_vcc->dev);
2553− PRINTD (DBG_FLOW|DBG_VCC, "hrz_setsockopt");
2554− switch (level) {
2555− case SOL_SOCKET:
2556− switch (optname) {
2557−// case SO_BCTXOPT:
2558−// break;
2559−// case SO_BCRXOPT:
2560−// break;
2561− default:
2562− return -ENOPROTOOPT;
2563− };
2564− break;
2565− }
2566− return -EINVAL;
2567−}
2568−#endif
2569−
25702530 #if 0
25712531 static int hrz_ioctl (struct atm_dev * atm_dev, unsigned int cmd, void *arg) {
25722532 hrz_dev * dev = HRZ_DEV(atm_dev);
drivers/atm/iphase.c+0−16
@@ -2880,20 +2880,6 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) · 2879 unmodified lines
28802880 return 0;
28812881 }
28822882
2883−static int ia_getsockopt(struct atm_vcc *vcc, int level, int optname,
2884− void __user *optval, int optlen)
2885−{
2886− IF_EVENT(printk(">ia_getsockopt\n");)
2887− return -EINVAL;
2888−}
2889−
2890−static int ia_setsockopt(struct atm_vcc *vcc, int level, int optname,
2891− void __user *optval, unsigned int optlen)
2892−{
2893− IF_EVENT(printk(">ia_setsockopt\n");)
2894− return -EINVAL;
2895−}
2896−
28972883 static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28982884 IADEV *iadev;
28992885 struct dle *wr_ptr;
@@ -3164,8 +3150,6 @@ static const struct atmdev_ops ops = { · 264 unmodified lines
31643150 .open = ia_open,
31653151 .close = ia_close,
31663152 .ioctl = ia_ioctl,
3167− .getsockopt = ia_getsockopt,
3168− .setsockopt = ia_setsockopt,
31693153 .send = ia_send,
31703154 .phy_put = ia_phy_put,
31713155 .phy_get = ia_phy_get,
drivers/atm/lanai.c+0−2
@@ -2537,8 +2537,6 @@ static const struct atmdev_ops ops = { · 2536 unmodified lines
25372537 .dev_close = lanai_dev_close,
25382538 .open = lanai_open,
25392539 .close = lanai_close,
2540− .getsockopt = NULL,
2541− .setsockopt = NULL,
25422540 .send = lanai_send,
25432541 .phy_put = NULL,
25442542 .phy_get = NULL,
drivers/atm/solos-pci.c+0−2
@@ -1179,8 +1179,6 @@ static const struct atmdev_ops fpga_ops = { · 1178 unmodified lines
11791179 .open = popen,
11801180 .close = pclose,
11811181 .ioctl = NULL,
1182− .getsockopt = NULL,
1183− .setsockopt = NULL,
11841182 .send = psend,
11851183 .send_oam = NULL,
11861184 .phy_put = NULL,
drivers/atm/zatm.c+0−16
@@ -1515,20 +1515,6 @@ static int zatm_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg) · 1514 unmodified lines
15151515 }
15161516 }
15171517
1518−
1519−static int zatm_getsockopt(struct atm_vcc *vcc,int level,int optname,
1520− void __user *optval,int optlen)
1521−{
1522− return -EINVAL;
1523−}
1524−
1525−
1526−static int zatm_setsockopt(struct atm_vcc *vcc,int level,int optname,
1527− void __user *optval,unsigned int optlen)
1528−{
1529− return -EINVAL;
1530−}
1531−
15321518 static int zatm_send(struct atm_vcc *vcc,struct sk_buff *skb)
15331519 {
15341520 int error;
@@ -1582,8 +1568,6 @@ static const struct atmdev_ops ops = { · 47 unmodified lines
15821568 .open = zatm_open,
15831569 .close = zatm_close,
15841570 .ioctl = zatm_ioctl,
1585− .getsockopt = zatm_getsockopt,
1586− .setsockopt = zatm_setsockopt,
15871571 .send = zatm_send,
15881572 .phy_put = zatm_phy_put,
15891573 .phy_get = zatm_phy_get,
include/linux/atmdev.h+0−9
@@ -176,11 +176,6 @@ struct atm_dev { · 175 unmodified lines
176176 #define ATM_OF_IMMED 1 /* Attempt immediate delivery */
177177 #define ATM_OF_INRATE 2 /* Attempt in-rate delivery */
178178
179−
180−/*
181− * ioctl, getsockopt, and setsockopt are optional and can be set to NULL.
182− */
183−
184179 struct atmdev_ops { /* only send is required */
185180 void (*dev_close)(struct atm_dev *dev);
186181 int (*open)(struct atm_vcc *vcc);
@@ -190,10 +185,6 @@ struct atmdev_ops { /* only send is required */ · 3 unmodified lines
190185 int (*compat_ioctl)(struct atm_dev *dev,unsigned int cmd,
191186 void __user *arg);
192187 #endif
193− int (*getsockopt)(struct atm_vcc *vcc,int level,int optname,
194− void __user *optval,int optlen);
195− int (*setsockopt)(struct atm_vcc *vcc,int level,int optname,
196− void __user *optval,unsigned int optlen);
197188 int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
198189 int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags);
199190 void (*phy_put)(struct atm_dev *dev,unsigned char value,
net/atm/common.c+2−12
@@ -782,13 +782,8 @@ int vcc_setsockopt(struct socket *sock, int level, int optname, · 781 unmodified lines
782782 vcc->atm_options &= ~ATM_ATMOPT_CLP;
783783 return 0;
784784 default:
785− if (level == SOL_SOCKET)
786− return -EINVAL;
787− break;
788− }
789− if (!vcc->dev || !vcc->dev->ops->setsockopt)
790785 return -EINVAL;
791− return vcc->dev->ops->setsockopt(vcc, level, optname, optval, optlen);
786+ }
792787 }
793788
794789 int vcc_getsockopt(struct socket *sock, int level, int optname,
@@ -826,13 +821,8 @@ int vcc_getsockopt(struct socket *sock, int level, int optname, · 31 unmodified lines
826821 return copy_to_user(optval, &pvc, sizeof(pvc)) ? -EFAULT : 0;
827822 }
828823 default:
829− if (level == SOL_SOCKET)
830− return -EINVAL;
831− break;
832− }
833− if (!vcc->dev || !vcc->dev->ops->getsockopt)
834824 return -EINVAL;
835− return vcc->dev->ops->getsockopt(vcc, level, optname, optval, len);
825+ }
836826 }
837827
838828 int register_atmdevice_notifier(struct notifier_block *nb)