Merge to Fedora Core 2 kernel-2.6.8-1.521

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

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index e652d8f..e0b5e89 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -56,12 +56,10 @@ DECLARE_MUTEX(rtnl_sem);
 void rtnl_lock(void)
 {
        rtnl_shlock();
-       rtnl_exlock();
 }
  
 void rtnl_unlock(void)
 {
-       rtnl_exunlock();
        rtnl_shunlock();
 
        netdev_run_todo();
@@ -337,7 +335,6 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
        struct rtnetlink_link *link_tab;
        struct rtattr   *rta[RTATTR_MAX];
 
-       int exclusive = 0;
        int sz_idx, kind;
        int min_len;
        int family;
@@ -404,14 +401,6 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
                return -1;
        }
 
-       if (kind != 2) {
-               if (rtnl_exlock_nowait()) {
-                       *errp = 0;
-                       return -1;
-               }
-               exclusive = 1;
-       }
-
        memset(&rta, 0, sizeof(rta));
 
        min_len = rtm_min[sz_idx];
@@ -439,14 +428,10 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
                goto err_inval;
        err = link->doit(skb, nlh, (void *)&rta);
 
-       if (exclusive)
-               rtnl_exunlock();
        *errp = err;
        return err;
 
 err_inval:
-       if (exclusive)
-               rtnl_exunlock();
        *errp = -EINVAL;
        return -1;
 }