Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits)
  [NET]: Make sure sockets implement splice_read
  netconsole: avoid null pointer dereference at show_local_mac()
  [IPV6]: Fix reversed local_df test in ip6_fragment
  [XFRM]: Avoid bogus BUG() when throwing new policy away.
  [AF_KEY]: Fix bug in spdadd
  [NETFILTER] nf_conntrack_proto_tcp.c: Mistyped state corrected.
  net: xfrm statistics depend on INET
  [NETFILTER]: make secmark_tg_destroy() static
  [INET]: Unexport inet_listen_wlock
  [INET]: Unexport __inet_hash_connect
  [NET]: Improve cache line coherency of ingress qdisc
  [NET]: Fix race in dev_close(). (Bug 9750)
  [IPSEC]: Fix bogus usage of u64 on input sequence number
  [RTNETLINK]: Send a single notification on device state changes.
  [NETLABLE]: Hide netlbl_unlabel_audit_addr6 under ifdef CONFIG_IPV6.
  [NETLABEL]: Don't produce unused variables when IPv6 is off.
  [NETLABEL]: Compilation for CONFIG_AUDIT=n case.
  [GENETLINK]: Relax dances with genl_lock.
  [NETLABEL]: Fix lookup logic of netlbl_domhsh_search_def.
  [IPV6]: remove unused method declaration (net/ndisc.h).
  ...

1 files changed, 26 insertions, 10 deletions

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 61ac8d06292c..ecb02afd52dc 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -504,7 +504,7 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id,
 
 EXPORT_SYMBOL_GPL(rtnl_put_cacheinfo);
 
-static void set_operstate(struct net_device *dev, unsigned char transition)
+static int set_operstate(struct net_device *dev, unsigned char transition, bool send_notification)
 {
         unsigned char operstate = dev->operstate;
 
@@ -527,8 +527,12 @@ static void set_operstate(struct net_device *dev, unsigned char transition)
                 write_lock_bh(&dev_base_lock);
                 dev->operstate = operstate;
                 write_unlock_bh(&dev_base_lock);
-                netdev_state_change(dev);
-        }
+
+                if (send_notification)
+                        netdev_state_change(dev);
+                return 1;
+        } else
+                return 0;
 }
 
 static void copy_rtnl_link_stats(struct rtnl_link_stats *a,
@@ -822,6 +826,7 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
         if (tb[IFLA_BROADCAST]) {
                 nla_memcpy(dev->broadcast, tb[IFLA_BROADCAST], dev->addr_len);
                 send_addr_notify = 1;
+                modified = 1;
         }
 
         if (ifm->ifi_flags || ifm->ifi_change) {
@@ -834,16 +839,23 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
                 dev_change_flags(dev, flags);
         }
 
-        if (tb[IFLA_TXQLEN])
-                dev->tx_queue_len = nla_get_u32(tb[IFLA_TXQLEN]);
+        if (tb[IFLA_TXQLEN]) {
+                if (dev->tx_queue_len != nla_get_u32(tb[IFLA_TXQLEN])) {
+                        dev->tx_queue_len = nla_get_u32(tb[IFLA_TXQLEN]);
+                        modified = 1;
+                }
+        }
 
         if (tb[IFLA_OPERSTATE])
-                set_operstate(dev, nla_get_u8(tb[IFLA_OPERSTATE]));
+                modified |= set_operstate(dev, nla_get_u8(tb[IFLA_OPERSTATE]), false);
 
         if (tb[IFLA_LINKMODE]) {
-                write_lock_bh(&dev_base_lock);
-                dev->link_mode = nla_get_u8(tb[IFLA_LINKMODE]);
-                write_unlock_bh(&dev_base_lock);
+                if (dev->link_mode != nla_get_u8(tb[IFLA_LINKMODE])) {
+                        write_lock_bh(&dev_base_lock);
+                        dev->link_mode = nla_get_u8(tb[IFLA_LINKMODE]);
+                        write_lock_bh(&dev_base_lock);
+                        modified = 1;
+                }
         }
 
         err = 0;
@@ -857,6 +869,10 @@ errout:
 
         if (send_addr_notify)
                 call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
+
+        if (modified)
+                netdev_state_change(dev);
+
         return err;
 }
 
@@ -974,7 +990,7 @@ struct net_device *rtnl_create_link(struct net *net, char *ifname,
         if (tb[IFLA_TXQLEN])
                 dev->tx_queue_len = nla_get_u32(tb[IFLA_TXQLEN]);
         if (tb[IFLA_OPERSTATE])
-                set_operstate(dev, nla_get_u8(tb[IFLA_OPERSTATE]));
+                set_operstate(dev, nla_get_u8(tb[IFLA_OPERSTATE]), true);
         if (tb[IFLA_LINKMODE])
                 dev->link_mode = nla_get_u8(tb[IFLA_LINKMODE]);