Merge tag 'linux-kselftest-kunit-5.11-rc1' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / drivers / atm / iphase.c

diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 8c7a996..eef637f 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,