6 files changed, 194 insertions, 22 deletions

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 26a646d4eb32..c9230c398697 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -554,6 +554,12 @@ static const struct net_device_ops br2684_netdev_ops = {
         .ndo_validate_addr      = eth_validate_addr,
 };
 
+static const struct net_device_ops br2684_netdev_ops_routed = {
+        .ndo_start_xmit         = br2684_start_xmit,
+        .ndo_set_mac_address    = br2684_mac_addr,
+        .ndo_change_mtu         = eth_change_mtu
+};
+
 static void br2684_setup(struct net_device *netdev)
 {
         struct br2684_dev *brdev = BRPRIV(netdev);
@@ -569,11 +575,10 @@ static void br2684_setup(struct net_device *netdev)
 static void br2684_setup_routed(struct net_device *netdev)
 {
         struct br2684_dev *brdev = BRPRIV(netdev);
-        brdev->net_dev = netdev;
 
+        brdev->net_dev = netdev;
         netdev->hard_header_len = 0;
-
-        netdev->netdev_ops = &br2684_netdev_ops;
+        netdev->netdev_ops = &br2684_netdev_ops_routed;
         netdev->addr_len = 0;
         netdev->mtu = 1500;
         netdev->type = ARPHRD_PPP;
diff --git a/net/atm/common.c b/net/atm/common.c
index 950bd16d2383..d61e051e0a3f 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -496,7 +496,7 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
         error = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
         if (error)
                 return error;
-        sock_recv_timestamp(msg, sk, skb);
+        sock_recv_ts_and_drops(msg, sk, skb);
         pr_debug("RcvM %d -= %d\n", atomic_read(&sk->sk_rmem_alloc), skb->truesize);
         atm_return(vcc, skb->truesize);
         skb_free_datagram(sk, skb);
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index 4da8892ced5f..2ea40995dced 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -191,8 +191,181 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 }
 
 #ifdef CONFIG_COMPAT
-int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+/*
+ * FIXME:
+ * The compat_ioctl handling is duplicated, using both these conversion
+ * routines and the compat argument to the actual handlers. Both
+ * versions are somewhat incomplete and should be merged, e.g. by
+ * moving the ioctl number translation into the actual handlers and
+ * killing the conversion code.
+ *
+ * -arnd, November 2009
+ */
+#define ATM_GETLINKRATE32 _IOW('a', ATMIOC_ITF+1, struct compat_atmif_sioc)
+#define ATM_GETNAMES32    _IOW('a', ATMIOC_ITF+3, struct compat_atm_iobuf)
+#define ATM_GETTYPE32     _IOW('a', ATMIOC_ITF+4, struct compat_atmif_sioc)
+#define ATM_GETESI32      _IOW('a', ATMIOC_ITF+5, struct compat_atmif_sioc)
+#define ATM_GETADDR32     _IOW('a', ATMIOC_ITF+6, struct compat_atmif_sioc)
+#define ATM_RSTADDR32     _IOW('a', ATMIOC_ITF+7, struct compat_atmif_sioc)
+#define ATM_ADDADDR32     _IOW('a', ATMIOC_ITF+8, struct compat_atmif_sioc)
+#define ATM_DELADDR32     _IOW('a', ATMIOC_ITF+9, struct compat_atmif_sioc)
+#define ATM_GETCIRANGE32  _IOW('a', ATMIOC_ITF+10, struct compat_atmif_sioc)
+#define ATM_SETCIRANGE32  _IOW('a', ATMIOC_ITF+11, struct compat_atmif_sioc)
+#define ATM_SETESI32      _IOW('a', ATMIOC_ITF+12, struct compat_atmif_sioc)
+#define ATM_SETESIF32     _IOW('a', ATMIOC_ITF+13, struct compat_atmif_sioc)
+#define ATM_GETSTAT32     _IOW('a', ATMIOC_SARCOM+0, struct compat_atmif_sioc)
+#define ATM_GETSTATZ32    _IOW('a', ATMIOC_SARCOM+1, struct compat_atmif_sioc)
+#define ATM_GETLOOP32     _IOW('a', ATMIOC_SARCOM+2, struct compat_atmif_sioc)
+#define ATM_SETLOOP32     _IOW('a', ATMIOC_SARCOM+3, struct compat_atmif_sioc)
+#define ATM_QUERYLOOP32   _IOW('a', ATMIOC_SARCOM+4, struct compat_atmif_sioc)
+
+static struct {
+        unsigned int cmd32;
+        unsigned int cmd;
+} atm_ioctl_map[] = {
+        { ATM_GETLINKRATE32, ATM_GETLINKRATE },
+        { ATM_GETNAMES32,    ATM_GETNAMES },
+        { ATM_GETTYPE32,     ATM_GETTYPE },
+        { ATM_GETESI32,      ATM_GETESI },
+        { ATM_GETADDR32,     ATM_GETADDR },
+        { ATM_RSTADDR32,     ATM_RSTADDR },
+        { ATM_ADDADDR32,     ATM_ADDADDR },
+        { ATM_DELADDR32,     ATM_DELADDR },
+        { ATM_GETCIRANGE32,  ATM_GETCIRANGE },
+        { ATM_SETCIRANGE32,  ATM_SETCIRANGE },
+        { ATM_SETESI32,      ATM_SETESI },
+        { ATM_SETESIF32,     ATM_SETESIF },
+        { ATM_GETSTAT32,     ATM_GETSTAT },
+        { ATM_GETSTATZ32,    ATM_GETSTATZ },
+        { ATM_GETLOOP32,     ATM_GETLOOP },
+        { ATM_SETLOOP32,     ATM_SETLOOP },
+        { ATM_QUERYLOOP32,   ATM_QUERYLOOP },
+};
+
+#define NR_ATM_IOCTL ARRAY_SIZE(atm_ioctl_map)
+
+static int do_atm_iobuf(struct socket *sock, unsigned int cmd,
+                        unsigned long arg)
+{
+        struct atm_iobuf __user *iobuf;
+        struct compat_atm_iobuf __user *iobuf32;
+        u32 data;
+        void __user *datap;
+        int len, err;
+
+        iobuf = compat_alloc_user_space(sizeof(*iobuf));
+        iobuf32 = compat_ptr(arg);
+
+        if (get_user(len, &iobuf32->length) ||
+            get_user(data, &iobuf32->buffer))
+                return -EFAULT;
+        datap = compat_ptr(data);
+        if (put_user(len, &iobuf->length) ||
+            put_user(datap, &iobuf->buffer))
+                return -EFAULT;
+
+        err = do_vcc_ioctl(sock, cmd, (unsigned long) iobuf, 0);
+
+        if (!err) {
+                if (copy_in_user(&iobuf32->length, &iobuf->length,
+                                 sizeof(int)))
+                        err = -EFAULT;
+        }
+
+        return err;
+}
+
+static int do_atmif_sioc(struct socket *sock, unsigned int cmd,
+                         unsigned long arg)
+{
+        struct atmif_sioc __user *sioc;
+        struct compat_atmif_sioc __user *sioc32;
+        u32 data;
+        void __user *datap;
+        int err;
+
+        sioc = compat_alloc_user_space(sizeof(*sioc));
+        sioc32 = compat_ptr(arg);
+
+        if (copy_in_user(&sioc->number, &sioc32->number, 2 * sizeof(int))
+            || get_user(data, &sioc32->arg))
+                return -EFAULT;
+        datap = compat_ptr(data);
+        if (put_user(datap, &sioc->arg))
+                return -EFAULT;
+
+        err = do_vcc_ioctl(sock, cmd, (unsigned long) sioc, 0);
+
+        if (!err) {
+                if (copy_in_user(&sioc32->length, &sioc->length,
+                                 sizeof(int)))
+                        err = -EFAULT;
+        }
+        return err;
+}
+
+static int do_atm_ioctl(struct socket *sock, unsigned int cmd32,
+                        unsigned long arg)
+{
+        int i;
+        unsigned int cmd = 0;
+
+        switch (cmd32) {
+        case SONET_GETSTAT:
+        case SONET_GETSTATZ:
+        case SONET_GETDIAG:
+        case SONET_SETDIAG:
+        case SONET_CLRDIAG:
+        case SONET_SETFRAMING:
+        case SONET_GETFRAMING:
+        case SONET_GETFRSENSE:
+                return do_atmif_sioc(sock, cmd32, arg);
+        }
+
+        for (i = 0; i < NR_ATM_IOCTL; i++) {
+                if (cmd32 == atm_ioctl_map[i].cmd32) {
+                        cmd = atm_ioctl_map[i].cmd;
+                        break;
+                }
+        }
+        if (i == NR_ATM_IOCTL)
+                return -EINVAL;
+
+        switch (cmd) {
+        case ATM_GETNAMES:
+                return do_atm_iobuf(sock, cmd, arg);
+
+        case ATM_GETLINKRATE:
+        case ATM_GETTYPE:
+        case ATM_GETESI:
+        case ATM_GETADDR:
+        case ATM_RSTADDR:
+        case ATM_ADDADDR:
+        case ATM_DELADDR:
+        case ATM_GETCIRANGE:
+        case ATM_SETCIRANGE:
+        case ATM_SETESI:
+        case ATM_SETESIF:
+        case ATM_GETSTAT:
+        case ATM_GETSTATZ:
+        case ATM_GETLOOP:
+        case ATM_SETLOOP:
+        case ATM_QUERYLOOP:
+                return do_atmif_sioc(sock, cmd, arg);
+        }
+
+        return -EINVAL;
+}
+
+int vcc_compat_ioctl(struct socket *sock, unsigned int cmd,
+                     unsigned long arg)
 {
-        return do_vcc_ioctl(sock, cmd, arg, 1);
+        int ret;
+
+        ret = do_vcc_ioctl(sock, cmd, arg, 1);
+        if (ret != -ENOIOCTLCMD)
+                return ret;
+
+        return do_atm_ioctl(sock, cmd, arg);
 }
 #endif
diff --git a/net/atm/lec.c b/net/atm/lec.c
index b2d644560323..42749b7b917c 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -62,7 +62,6 @@ static int lec_open(struct net_device *dev);
 static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
                                   struct net_device *dev);
 static int lec_close(struct net_device *dev);
-static void lec_init(struct net_device *dev);
 static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
                                           const unsigned char *mac_addr);
 static int lec_arp_remove(struct lec_priv *priv,
@@ -670,13 +669,6 @@ static const struct net_device_ops lec_netdev_ops = {
         .ndo_set_multicast_list = lec_set_multicast_list,
 };
 
-
-static void lec_init(struct net_device *dev)
-{
-        dev->netdev_ops = &lec_netdev_ops;
-        printk("%s: Initialized!\n", dev->name);
-}
-
 static const unsigned char lec_ctrl_magic[] = {
         0xff,
         0x00,
@@ -893,6 +885,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
                         dev_lec[i] = alloc_etherdev(size);
                 if (!dev_lec[i])
                         return -ENOMEM;
+                dev_lec[i]->netdev_ops = &lec_netdev_ops;
                 snprintf(dev_lec[i]->name, IFNAMSIZ, "lec%d", i);
                 if (register_netdev(dev_lec[i])) {
                         free_netdev(dev_lec[i]);
@@ -901,7 +894,6 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
 
                 priv = netdev_priv(dev_lec[i]);
                 priv->is_trdev = is_trdev;
-                lec_init(dev_lec[i]);
         } else {
                 priv = netdev_priv(dev_lec[i]);
                 if (priv->lecd)
diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index d4c024504f99..8d74e62b0d79 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -127,7 +127,8 @@ static const struct proto_ops pvc_proto_ops = {
 };
 
 
-static int pvc_create(struct net *net, struct socket *sock,int protocol)
+static int pvc_create(struct net *net, struct socket *sock, int protocol,
+                      int kern)
 {
         if (net != &init_net)
                 return -EAFNOSUPPORT;
@@ -137,7 +138,7 @@ static int pvc_create(struct net *net, struct socket *sock,int protocol)
 }
 
 
-static struct net_proto_family pvc_family_ops = {
+static const struct net_proto_family pvc_family_ops = {
         .family = PF_ATMPVC,
         .create = pvc_create,
         .owner = THIS_MODULE,
diff --git a/net/atm/svc.c b/net/atm/svc.c
index f90d143c4b25..66e1d9b3e5de 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -25,7 +25,7 @@
 #include "signaling.h"
 #include "addr.h"
 
-static int svc_create(struct net *net, struct socket *sock,int protocol);
+static int svc_create(struct net *net, struct socket *sock, int protocol, int kern);
 
 /*
  * Note: since all this is still nicely synchronized with the signaling demon,
@@ -330,7 +330,7 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
 
         lock_sock(sk);
 
-        error = svc_create(sock_net(sk), newsock,0);
+        error = svc_create(sock_net(sk), newsock, 0, 0);
         if (error)
                 goto out;
 
@@ -650,11 +650,12 @@ static const struct proto_ops svc_proto_ops = {
 };
 
 
-static int svc_create(struct net *net, struct socket *sock,int protocol)
+static int svc_create(struct net *net, struct socket *sock, int protocol,
+                      int kern)
 {
         int error;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EAFNOSUPPORT;
 
         sock->ops = &svc_proto_ops;
@@ -666,7 +667,7 @@ static int svc_create(struct net *net, struct socket *sock,int protocol)
 }
 
 
-static struct net_proto_family svc_family_ops = {
+static const struct net_proto_family svc_family_ops = {
         .family = PF_ATMSVC,
         .create = svc_create,
         .owner = THIS_MODULE,