diff options
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/rtnetlink.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index fc122fdb266a..e7c6006bc3ea 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
@@ -2126,12 +2126,13 @@ EXPORT_SYMBOL(rtmsg_ifinfo); | |||
2126 | static int nlmsg_populate_fdb_fill(struct sk_buff *skb, | 2126 | static int nlmsg_populate_fdb_fill(struct sk_buff *skb, |
2127 | struct net_device *dev, | 2127 | struct net_device *dev, |
2128 | u8 *addr, u32 pid, u32 seq, | 2128 | u8 *addr, u32 pid, u32 seq, |
2129 | int type, unsigned int flags) | 2129 | int type, unsigned int flags, |
2130 | int nlflags) | ||
2130 | { | 2131 | { |
2131 | struct nlmsghdr *nlh; | 2132 | struct nlmsghdr *nlh; |
2132 | struct ndmsg *ndm; | 2133 | struct ndmsg *ndm; |
2133 | 2134 | ||
2134 | nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ndm), NLM_F_MULTI); | 2135 | nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ndm), nlflags); |
2135 | if (!nlh) | 2136 | if (!nlh) |
2136 | return -EMSGSIZE; | 2137 | return -EMSGSIZE; |
2137 | 2138 | ||
@@ -2169,7 +2170,7 @@ static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, int type) | |||
2169 | if (!skb) | 2170 | if (!skb) |
2170 | goto errout; | 2171 | goto errout; |
2171 | 2172 | ||
2172 | err = nlmsg_populate_fdb_fill(skb, dev, addr, 0, 0, type, NTF_SELF); | 2173 | err = nlmsg_populate_fdb_fill(skb, dev, addr, 0, 0, type, NTF_SELF, 0); |
2173 | if (err < 0) { | 2174 | if (err < 0) { |
2174 | kfree_skb(skb); | 2175 | kfree_skb(skb); |
2175 | goto errout; | 2176 | goto errout; |
@@ -2394,7 +2395,8 @@ static int nlmsg_populate_fdb(struct sk_buff *skb, | |||
2394 | 2395 | ||
2395 | err = nlmsg_populate_fdb_fill(skb, dev, ha->addr, | 2396 | err = nlmsg_populate_fdb_fill(skb, dev, ha->addr, |
2396 | portid, seq, | 2397 | portid, seq, |
2397 | RTM_NEWNEIGH, NTF_SELF); | 2398 | RTM_NEWNEIGH, NTF_SELF, |
2399 | NLM_F_MULTI); | ||
2398 | if (err < 0) | 2400 | if (err < 0) |
2399 | return err; | 2401 | return err; |
2400 | skip: | 2402 | skip: |