Merge branch 'linus' into perf/urgent, to synchronize with upstream

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

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index d9001b5..cdad6ed 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1041,6 +1041,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
               + nla_total_size(4)  /* IFLA_MIN_MTU */
               + nla_total_size(4)  /* IFLA_MAX_MTU */
               + rtnl_prop_list_size(dev)
+              + nla_total_size(MAX_ADDR_LEN) /* IFLA_PERM_ADDRESS */
               + 0;
 }
 
@@ -1757,6 +1758,9 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,
            nla_put_s32(skb, IFLA_NEW_IFINDEX, new_ifindex) < 0)
                goto nla_put_failure;
 
+       if (memchr_inv(dev->perm_addr, '\0', dev->addr_len) &&
+           nla_put(skb, IFLA_PERM_ADDRESS, dev->addr_len, dev->perm_addr))
+               goto nla_put_failure;
 
        rcu_read_lock();
        if (rtnl_fill_link_af(skb, dev, ext_filter_mask))
@@ -1822,6 +1826,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
        [IFLA_PROP_LIST]        = { .type = NLA_NESTED },
        [IFLA_ALT_IFNAME]       = { .type = NLA_STRING,
                                    .len = ALTIFNAMSIZ - 1 },
+       [IFLA_PERM_ADDRESS]     = { .type = NLA_REJECT },
 };
 
 static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {