[NET] core: add RFC2863 operstate

[net-next-2.6.git] / net / core / rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 9bed7569ce3f30b7f13f522f973aa45e73a2840f..1c15a907066ff26f1e960771d39d70ea6ab7c6c8 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -49,6 +49,7 @@
 #include <net/udp.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
+#include <net/netlink.h>
 
 DECLARE_MUTEX(rtnl_sem);
 
@@ -178,6 +179,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 +235,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 +433,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];
 
@@ -454,7 +505,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 +513,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 +570,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 +577,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,75 +620,13 @@ 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);
-               }
-
+               netlink_run_queue(sk, &qlen, &rtnetlink_rcv_msg);
                up(&rtnl_sem);
 
                netdev_run_todo();