Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git] / net / core / rtnetlink.c
index 9bed756..3fcfa9c 100644 (file)
@@ -35,6 +35,7 @@
 #include <linux/skbuff.h>
 #include <linux/init.h>
 #include <linux/security.h>
+#include <linux/mutex.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <net/udp.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
+#include <net/netlink.h>
+#ifdef CONFIG_NET_WIRELESS_RTNETLINK
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+#endif /* CONFIG_NET_WIRELESS_RTNETLINK */
 
-DECLARE_MUTEX(rtnl_sem);
+static DEFINE_MUTEX(rtnl_mutex);
 
 void rtnl_lock(void)
 {
-       rtnl_shlock();
+       mutex_lock(&rtnl_mutex);
 }
 
-int rtnl_lock_interruptible(void)
+void __rtnl_unlock(void)
 {
-       return down_interruptible(&rtnl_sem);
+       mutex_unlock(&rtnl_mutex);
 }
+
 void rtnl_unlock(void)
 {
-       rtnl_shunlock();
-
+       mutex_unlock(&rtnl_mutex);
+       if (rtnl && rtnl->sk_receive_queue.qlen)
+               rtnl->sk_data_ready(rtnl, 0);
        netdev_run_todo();
 }
 
+int rtnl_trylock(void)
+{
+       return mutex_trylock(&rtnl_mutex);
+}
+
 int rtattr_parse(struct rtattr *tb[], int maxattr, struct rtattr *rta, int len)
 {
        memset(tb, 0, sizeof(struct rtattr*)*maxattr);
@@ -178,6 +190,33 @@ rtattr_failure:
 }
 
 
+static void set_operstate(struct net_device *dev, unsigned char transition)
+{
+       unsigned char operstate = dev->operstate;
+
+       switch(transition) {
+       case IF_OPER_UP:
+               if ((operstate == IF_OPER_DORMANT ||
+                    operstate == IF_OPER_UNKNOWN) &&
+                   !netif_dormant(dev))
+                       operstate = IF_OPER_UP;
+               break;
+
+       case IF_OPER_DORMANT:
+               if (operstate == IF_OPER_UP ||
+                   operstate == IF_OPER_UNKNOWN)
+                       operstate = IF_OPER_DORMANT;
+               break;
+       };
+
+       if (dev->operstate != operstate) {
+               write_lock_bh(&dev_base_lock);
+               dev->operstate = operstate;
+               write_unlock_bh(&dev_base_lock);
+               netdev_state_change(dev);
+       }
+}
+
 static int rtnetlink_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
                                 int type, u32 pid, u32 seq, u32 change, 
                                 unsigned int flags)
@@ -207,6 +246,13 @@ static int rtnetlink_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
                RTA_PUT(skb, IFLA_WEIGHT, sizeof(weight), &weight);
        }
 
+       if (1) {
+               u8 operstate = netif_running(dev)?dev->operstate:IF_OPER_DOWN;
+               u8 link_mode = dev->link_mode;
+               RTA_PUT(skb, IFLA_OPERSTATE, sizeof(operstate), &operstate);
+               RTA_PUT(skb, IFLA_LINKMODE, sizeof(link_mode), &link_mode);
+       }
+
        if (1) {
                struct rtnl_link_ifmap map = {
                        .mem_start   = dev->mem_start,
@@ -398,6 +444,22 @@ static int do_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
                dev->weight = *((u32 *) RTA_DATA(ida[IFLA_WEIGHT - 1]));
        }
 
+       if (ida[IFLA_OPERSTATE - 1]) {
+               if (ida[IFLA_OPERSTATE - 1]->rta_len != RTA_LENGTH(sizeof(u8)))
+                       goto out;
+
+               set_operstate(dev, *((u8 *) RTA_DATA(ida[IFLA_OPERSTATE - 1])));
+       }
+
+       if (ida[IFLA_LINKMODE - 1]) {
+               if (ida[IFLA_LINKMODE - 1]->rta_len != RTA_LENGTH(sizeof(u8)))
+                       goto out;
+
+               write_lock_bh(&dev_base_lock);
+               dev->link_mode = *((u8 *) RTA_DATA(ida[IFLA_LINKMODE - 1]));
+               write_unlock_bh(&dev_base_lock);
+       }
+
        if (ifm->ifi_index >= 0 && ida[IFLA_IFNAME - 1]) {
                char ifname[IFNAMSIZ];
 
@@ -409,6 +471,17 @@ static int do_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
                        goto out;
        }
 
+#ifdef CONFIG_NET_WIRELESS_RTNETLINK
+       if (ida[IFLA_WIRELESS - 1]) {
+
+               /* Call Wireless Extensions.
+                * Various stuff checked in there... */
+               err = wireless_rtnetlink_set(dev, RTA_DATA(ida[IFLA_WIRELESS - 1]), ida[IFLA_WIRELESS - 1]->rta_len);
+               if (err)
+                       goto out;
+       }
+#endif /* CONFIG_NET_WIRELESS_RTNETLINK */
+
        err = 0;
 
 out:
@@ -419,6 +492,83 @@ out:
        return err;
 }
 
+#ifdef CONFIG_NET_WIRELESS_RTNETLINK
+static int do_getlink(struct sk_buff *in_skb, struct nlmsghdr* in_nlh, void *arg)
+{
+       struct ifinfomsg  *ifm = NLMSG_DATA(in_nlh);
+       struct rtattr    **ida = arg;
+       struct net_device *dev;
+       struct ifinfomsg *r;
+       struct nlmsghdr  *nlh;
+       int err = -ENOBUFS;
+       struct sk_buff *skb;
+       unsigned char    *b;
+       char *iw_buf = NULL;
+       int iw_buf_len = 0;
+
+       if (ifm->ifi_index >= 0)
+               dev = dev_get_by_index(ifm->ifi_index);
+       else
+               return -EINVAL;
+       if (!dev)
+               return -ENODEV;
+
+#ifdef CONFIG_NET_WIRELESS_RTNETLINK
+       if (ida[IFLA_WIRELESS - 1]) {
+
+               /* Call Wireless Extensions. We need to know the size before
+                * we can alloc. Various stuff checked in there... */
+               err = wireless_rtnetlink_get(dev, RTA_DATA(ida[IFLA_WIRELESS - 1]), ida[IFLA_WIRELESS - 1]->rta_len, &iw_buf, &iw_buf_len);
+               if (err)
+                       goto out;
+       }
+#endif /* CONFIG_NET_WIRELESS_RTNETLINK */
+
+       /* Create a skb big enough to include all the data.
+        * Some requests are way bigger than 4k... Jean II */
+       skb = alloc_skb((NLMSG_LENGTH(sizeof(*r))) + (RTA_SPACE(iw_buf_len)),
+                       GFP_KERNEL);
+       if (!skb)
+               goto out;
+       b = skb->tail;
+
+       /* Put in the message the usual good stuff */
+       nlh = NLMSG_PUT(skb, NETLINK_CB(in_skb).pid, in_nlh->nlmsg_seq,
+                       RTM_NEWLINK, sizeof(*r));
+       r = NLMSG_DATA(nlh);
+       r->ifi_family = AF_UNSPEC;
+       r->__ifi_pad = 0;
+       r->ifi_type = dev->type;
+       r->ifi_index = dev->ifindex;
+       r->ifi_flags = dev->flags;
+       r->ifi_change = 0;
+
+       /* Put the wireless payload if it exist */
+       if(iw_buf != NULL)
+               RTA_PUT(skb, IFLA_WIRELESS, iw_buf_len,
+                       iw_buf + IW_EV_POINT_OFF);
+
+       nlh->nlmsg_len = skb->tail - b;
+
+       /* Needed ? */
+       NETLINK_CB(skb).dst_pid = NETLINK_CB(in_skb).pid;
+
+       err = netlink_unicast(rtnl, skb, NETLINK_CB(in_skb).pid, MSG_DONTWAIT);
+       if (err > 0)
+               err = 0;
+out:
+       if(iw_buf != NULL)
+               kfree(iw_buf);
+       dev_put(dev);
+       return err;
+
+rtattr_failure:
+nlmsg_failure:
+       kfree_skb(skb);
+       goto out;
+}
+#endif /* CONFIG_NET_WIRELESS_RTNETLINK */
+
 static int rtnetlink_dump_all(struct sk_buff *skb, struct netlink_callback *cb)
 {
        int idx;
@@ -454,7 +604,7 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change)
        if (!skb)
                return;
 
-       if (rtnetlink_fill_ifinfo(skb, dev, type, current->pid, 0, change, 0) < 0) {
+       if (rtnetlink_fill_ifinfo(skb, dev, type, 0, 0, change, 0) < 0) {
                kfree_skb(skb);
                return;
        }
@@ -462,11 +612,6 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change)
        netlink_broadcast(rtnl, skb, 0, RTNLGRP_LINK, GFP_KERNEL);
 }
 
-static int rtnetlink_done(struct netlink_callback *cb)
-{
-       return 0;
-}
-
 /* Protected by RTNL sempahore.  */
 static struct rtattr **rta_buf;
 static int rtattr_max;
@@ -524,8 +669,6 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
        }
 
        if (kind == 2 && nlh->nlmsg_flags&NLM_F_DUMP) {
-               u32 rlen;
-
                if (link->dumpit == NULL)
                        link = &(rtnetlink_links[PF_UNSPEC][type]);
 
@@ -533,14 +676,11 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
                        goto err_inval;
 
                if ((*errp = netlink_dump_start(rtnl, skb, nlh,
-                                               link->dumpit,
-                                               rtnetlink_done)) != 0) {
+                                               link->dumpit, NULL)) != 0) {
                        return -1;
                }
-               rlen = NLMSG_ALIGN(nlh->nlmsg_len);
-               if (rlen > skb->len)
-                       rlen = skb->len;
-               skb_pull(skb, rlen);
+
+               netlink_queue_skip(nlh, skb);
                return -1;
        }
 
@@ -579,76 +719,14 @@ err_inval:
        return -1;
 }
 
-/* 
- * Process one packet of messages.
- * Malformed skbs with wrong lengths of messages are discarded silently.
- */
-
-static inline int rtnetlink_rcv_skb(struct sk_buff *skb)
-{
-       int err;
-       struct nlmsghdr * nlh;
-
-       while (skb->len >= NLMSG_SPACE(0)) {
-               u32 rlen;
-
-               nlh = (struct nlmsghdr *)skb->data;
-               if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)
-                       return 0;
-               rlen = NLMSG_ALIGN(nlh->nlmsg_len);
-               if (rlen > skb->len)
-                       rlen = skb->len;
-               if (rtnetlink_rcv_msg(skb, nlh, &err)) {
-                       /* Not error, but we must interrupt processing here:
-                        *   Note, that in this case we do not pull message
-                        *   from skb, it will be processed later.
-                        */
-                       if (err == 0)
-                               return -1;
-                       netlink_ack(skb, nlh, err);
-               } else if (nlh->nlmsg_flags&NLM_F_ACK)
-                       netlink_ack(skb, nlh, 0);
-               skb_pull(skb, rlen);
-       }
-
-       return 0;
-}
-
-/*
- *  rtnetlink input queue processing routine:
- *     - process as much as there was in the queue upon entry.
- *     - feed skbs to rtnetlink_rcv_skb, until it refuse a message,
- *       that will occur, when a dump started.
- */
-
 static void rtnetlink_rcv(struct sock *sk, int len)
 {
-       unsigned int qlen = skb_queue_len(&sk->sk_receive_queue);
+       unsigned int qlen = 0;
 
        do {
-               struct sk_buff *skb;
-
-               rtnl_lock();
-
-               if (qlen > skb_queue_len(&sk->sk_receive_queue))
-                       qlen = skb_queue_len(&sk->sk_receive_queue);
-
-               for (; qlen; qlen--) {
-                       skb = skb_dequeue(&sk->sk_receive_queue);
-                       if (rtnetlink_rcv_skb(skb)) {
-                               if (skb->len)
-                                       skb_queue_head(&sk->sk_receive_queue,
-                                                      skb);
-                               else {
-                                       kfree_skb(skb);
-                                       qlen--;
-                               }
-                               break;
-                       }
-                       kfree_skb(skb);
-               }
-
-               up(&rtnl_sem);
+               mutex_lock(&rtnl_mutex);
+               netlink_run_queue(sk, &qlen, &rtnetlink_rcv_msg);
+               mutex_unlock(&rtnl_mutex);
 
                netdev_run_todo();
        } while (qlen);
@@ -656,7 +734,11 @@ static void rtnetlink_rcv(struct sock *sk, int len)
 
 static struct rtnetlink_link link_rtnetlink_table[RTM_NR_MSGTYPES] =
 {
-       [RTM_GETLINK     - RTM_BASE] = { .dumpit = rtnetlink_dump_ifinfo },
+       [RTM_GETLINK     - RTM_BASE] = {
+#ifdef CONFIG_NET_WIRELESS_RTNETLINK
+                                        .doit   = do_getlink,
+#endif /* CONFIG_NET_WIRELESS_RTNETLINK */
+                                        .dumpit = rtnetlink_dump_ifinfo },
        [RTM_SETLINK     - RTM_BASE] = { .doit   = do_setlink            },
        [RTM_GETADDR     - RTM_BASE] = { .dumpit = rtnetlink_dump_all    },
        [RTM_GETROUTE    - RTM_BASE] = { .dumpit = rtnetlink_dump_all    },
@@ -725,6 +807,5 @@ EXPORT_SYMBOL(rtnetlink_links);
 EXPORT_SYMBOL(rtnetlink_put_metrics);
 EXPORT_SYMBOL(rtnl);
 EXPORT_SYMBOL(rtnl_lock);
-EXPORT_SYMBOL(rtnl_lock_interruptible);
-EXPORT_SYMBOL(rtnl_sem);
+EXPORT_SYMBOL(rtnl_trylock);
 EXPORT_SYMBOL(rtnl_unlock);