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

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 17d47ad03ab79e33cd8c57a453a84505e4530c82..b3d8e00e76716ceadf15859cf51afc400c6c3c0b 100644 (file)
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2027,21 +2027,6 @@ static int eni_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
        return dev->phy->ioctl(dev,cmd,arg);
 }
 
-
-static int eni_getsockopt(struct atm_vcc *vcc,int level,int optname,
-    void __user *optval,int optlen)
-{
-       return -EINVAL;
-}
-
-
-static int eni_setsockopt(struct atm_vcc *vcc,int level,int optname,
-    void __user *optval,unsigned int optlen)
-{
-       return -EINVAL;
-}
-
-
 static int eni_send(struct atm_vcc *vcc,struct sk_buff *skb)
 {
        enum enq_res res;
@@ -2215,8 +2200,6 @@ static const struct atmdev_ops ops = {
        .open           = eni_open,
        .close          = eni_close,
        .ioctl          = eni_ioctl,
-       .getsockopt     = eni_getsockopt,
-       .setsockopt     = eni_setsockopt,
        .send           = eni_send,
        .phy_put        = eni_phy_put,
        .phy_get        = eni_phy_get,

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index cc87004d5e2d6235b4f1196c0d47a8ee81bff64c..2ca9ec8027342996ded892562f737b3a1864e21f 100644 (file)
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1277,8 +1277,6 @@ static const struct atmdev_ops ops = {
        .send =         fs_send,
        .owner =        THIS_MODULE,
        /* ioctl:          fs_ioctl, */
-       /* getsockopt:     fs_getsockopt, */
-       /* setsockopt:     fs_setsockopt, */
        /* change_qos:     fs_change_qos, */
 
        /* For now implement these internally here... */  

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index f4ad7ce25ae8d1cf79546d1c8be28daa0dbc4724..a81bc49c14acc6774dd04162ec9d06782476adaa 100644 (file)
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -1710,31 +1710,6 @@ fore200e_getstats(struct fore200e* fore200e)
     return 0;
 }
 
-
-static int
-fore200e_getsockopt(struct atm_vcc* vcc, int level, int optname, void __user *optval, int optlen)
-{
-    /* struct fore200e* fore200e = FORE200E_DEV(vcc->dev); */
-
-    DPRINTK(2, "getsockopt %d.%d.%d, level = %d, optname = 0x%x, optval = 0x%p, optlen = %d\n",
-           vcc->itf, vcc->vpi, vcc->vci, level, optname, optval, optlen);
-
-    return -EINVAL;
-}
-
-
-static int
-fore200e_setsockopt(struct atm_vcc* vcc, int level, int optname, void __user *optval, unsigned int optlen)
-{
-    /* struct fore200e* fore200e = FORE200E_DEV(vcc->dev); */
-    
-    DPRINTK(2, "setsockopt %d.%d.%d, level = %d, optname = 0x%x, optval = 0x%p, optlen = %d\n",
-           vcc->itf, vcc->vpi, vcc->vci, level, optname, optval, optlen);
-    
-    return -EINVAL;
-}
-
-
 #if 0 /* currently unused */
 static int
 fore200e_get_oc3(struct fore200e* fore200e, struct oc3_regs* regs)
@@ -3026,8 +3001,6 @@ static const struct atmdev_ops fore200e_ops = {
        .open       = fore200e_open,
        .close      = fore200e_close,
        .ioctl      = fore200e_ioctl,
-       .getsockopt = fore200e_getsockopt,
-       .setsockopt = fore200e_setsockopt,
        .send       = fore200e_send,
        .change_qos = fore200e_change_qos,
        .proc_read  = fore200e_proc_read,

diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index e5da51f907a25d1e733f8ab0ce4783f9bd1306f2..4f2951cbe69c08549350eca4aaad89fe8e3690e5 100644 (file)
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2527,46 +2527,6 @@ static void hrz_close (struct atm_vcc * atm_vcc) {
   clear_bit(ATM_VF_ADDR,&atm_vcc->flags);
 }
 
-#if 0
-static int hrz_getsockopt (struct atm_vcc * atm_vcc, int level, int optname,
-                          void *optval, int optlen) {
-  hrz_dev * dev = HRZ_DEV(atm_vcc->dev);
-  PRINTD (DBG_FLOW|DBG_VCC, "hrz_getsockopt");
-  switch (level) {
-    case SOL_SOCKET:
-      switch (optname) {
-//     case SO_BCTXOPT:
-//       break;
-//     case SO_BCRXOPT:
-//       break;
-       default:
-         return -ENOPROTOOPT;
-      };
-      break;
-  }
-  return -EINVAL;
-}
-
-static int hrz_setsockopt (struct atm_vcc * atm_vcc, int level, int optname,
-                          void *optval, unsigned int optlen) {
-  hrz_dev * dev = HRZ_DEV(atm_vcc->dev);
-  PRINTD (DBG_FLOW|DBG_VCC, "hrz_setsockopt");
-  switch (level) {
-    case SOL_SOCKET:
-      switch (optname) {
-//     case SO_BCTXOPT:
-//       break;
-//     case SO_BCRXOPT:
-//       break;
-       default:
-         return -ENOPROTOOPT;
-      };
-      break;
-  }
-  return -EINVAL;
-}
-#endif
-
 #if 0
 static int hrz_ioctl (struct atm_dev * atm_dev, unsigned int cmd, void *arg) {
   hrz_dev * dev = HRZ_DEV(atm_dev);

diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 8c7a996d1f16cfd5d2b86a73effe5562ce1732b0..eef637fd90b323ce182e4a5298d3eb9fefb89f36 100644 (file)
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2880,20 +2880,6 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
    return 0;  
 }  
   
-static int ia_getsockopt(struct atm_vcc *vcc, int level, int optname,   
-       void __user *optval, int optlen)  
-{  
-       IF_EVENT(printk(">ia_getsockopt\n");)  
-       return -EINVAL;  
-}  
-  
-static int ia_setsockopt(struct atm_vcc *vcc, int level, int optname,   
-       void __user *optval, unsigned int optlen)  
-{  
-       IF_EVENT(printk(">ia_setsockopt\n");)  
-       return -EINVAL;  
-}  
-  
 static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
         IADEV *iadev;
         struct dle *wr_ptr;
@@ -3164,8 +3150,6 @@ static const struct atmdev_ops ops = {
        .open           = ia_open,  
        .close          = ia_close,  
        .ioctl          = ia_ioctl,  
-       .getsockopt     = ia_getsockopt,  
-       .setsockopt     = ia_setsockopt,  
        .send           = ia_send,  
        .phy_put        = ia_phy_put,  
        .phy_get        = ia_phy_get,  

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 645a6bc1df8886dca37b0c8d5cbd52c826fd9cf7..986c1313694c66f3b79b7a853d4fd5b600942c5a 100644 (file)
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -2537,8 +2537,6 @@ static const struct atmdev_ops ops = {
        .dev_close      = lanai_dev_close,
        .open           = lanai_open,
        .close          = lanai_close,
-       .getsockopt     = NULL,
-       .setsockopt     = NULL,
        .send           = lanai_send,
        .phy_put        = NULL,
        .phy_get        = NULL,

diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index b7646ae55942e64b32265715c350ca9f73a7f7c6..94fbc3abe60e6a714c546bc2e8c6dce321742bbe 100644 (file)
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1179,8 +1179,6 @@ static const struct atmdev_ops fpga_ops = {
        .open =         popen,
        .close =        pclose,
        .ioctl =        NULL,
-       .getsockopt =   NULL,
-       .setsockopt =   NULL,
        .send =         psend,
        .send_oam =     NULL,
        .phy_put =      NULL,

diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 57f97b95a4531cc81079fefb60e55ed74ec58d85..2788b985edbe48a6261b6c808e0ef6228e3d1e4a 100644 (file)
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1515,20 +1515,6 @@ static int zatm_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
        }
 }
 
-
-static int zatm_getsockopt(struct atm_vcc *vcc,int level,int optname,
-    void __user *optval,int optlen)
-{
-       return -EINVAL;
-}
-
-
-static int zatm_setsockopt(struct atm_vcc *vcc,int level,int optname,
-    void __user *optval,unsigned int optlen)
-{
-       return -EINVAL;
-}
-
 static int zatm_send(struct atm_vcc *vcc,struct sk_buff *skb)
 {
        int error;
@@ -1582,8 +1568,6 @@ static const struct atmdev_ops ops = {
        .open           = zatm_open,
        .close          = zatm_close,
        .ioctl          = zatm_ioctl,
-       .getsockopt     = zatm_getsockopt,
-       .setsockopt     = zatm_setsockopt,
        .send           = zatm_send,
        .phy_put        = zatm_phy_put,
        .phy_get        = zatm_phy_get,

diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 8124815eb1218b5653572fc4a04f5d4d734e3469..5d5ff2203fa2209ebc1672f333dd67186ef6a6d1 100644 (file)
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -176,11 +176,6 @@ struct atm_dev {
 #define ATM_OF_IMMED  1                /* Attempt immediate delivery */
 #define ATM_OF_INRATE 2                /* Attempt in-rate delivery */
 
-
-/*
- * ioctl, getsockopt, and setsockopt are optional and can be set to NULL.
- */
-
 struct atmdev_ops { /* only send is required */
        void (*dev_close)(struct atm_dev *dev);
        int (*open)(struct atm_vcc *vcc);
@@ -190,10 +185,6 @@ struct atmdev_ops { /* only send is required */
        int (*compat_ioctl)(struct atm_dev *dev,unsigned int cmd,
                            void __user *arg);
 #endif
-       int (*getsockopt)(struct atm_vcc *vcc,int level,int optname,
-           void __user *optval,int optlen);
-       int (*setsockopt)(struct atm_vcc *vcc,int level,int optname,
-           void __user *optval,unsigned int optlen);
        int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
        int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags);
        void (*phy_put)(struct atm_dev *dev,unsigned char value,

diff --git a/net/atm/common.c b/net/atm/common.c
index 8575f5d52087d3f64f477e59edac2aa4e261ca9c..9b28f1fb3c69c897326afe03e58533232e377587 100644 (file)
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -782,13 +782,8 @@ int vcc_setsockopt(struct socket *sock, int level, int optname,
                        vcc->atm_options &= ~ATM_ATMOPT_CLP;
                return 0;
        default:
-               if (level == SOL_SOCKET)
-                       return -EINVAL;
-               break;
-       }
-       if (!vcc->dev || !vcc->dev->ops->setsockopt)
                return -EINVAL;
-       return vcc->dev->ops->setsockopt(vcc, level, optname, optval, optlen);
+       }
 }
 
 int vcc_getsockopt(struct socket *sock, int level, int optname,
@@ -826,13 +821,8 @@ int vcc_getsockopt(struct socket *sock, int level, int optname,
                return copy_to_user(optval, &pvc, sizeof(pvc)) ? -EFAULT : 0;
        }
        default:
-               if (level == SOL_SOCKET)
-                       return -EINVAL;
-               break;
-       }
-       if (!vcc->dev || !vcc->dev->ops->getsockopt)
                return -EINVAL;
-       return vcc->dev->ops->getsockopt(vcc, level, optname, optval, len);
+       }
 }
 
 int register_atmdevice_notifier(struct notifier_block *nb)