mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-14 12:49:08 +00:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/vxlan-next
Stephen Hemminger says: ==================== Here is current updates for vxlan in net-next. It includes Mike's changes to handle multiple destinations and lots of little cosmetic stuff. This is a fresh vxlan-next repository which was forked from net-next. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
936faf6c49
File diff suppressed because it is too large
Load Diff
@ -707,6 +707,11 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
||||
}
|
||||
}
|
||||
|
||||
if (is_zero_ether_addr(addr)) {
|
||||
pr_info("bridge: RTM_NEWNEIGH with invalid ether address\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
p = br_port_get_rtnl(dev);
|
||||
if (p == NULL) {
|
||||
pr_info("bridge: RTM_NEWNEIGH %s not a bridge port\n",
|
||||
|
@ -2109,10 +2109,6 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
|
||||
}
|
||||
|
||||
addr = nla_data(tb[NDA_LLADDR]);
|
||||
if (is_zero_ether_addr(addr)) {
|
||||
pr_info("PF_BRIDGE: RTM_NEWNEIGH with invalid ether address\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
err = -EOPNOTSUPP;
|
||||
|
||||
@ -2210,10 +2206,6 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh)
|
||||
}
|
||||
|
||||
addr = nla_data(tb[NDA_LLADDR]);
|
||||
if (is_zero_ether_addr(addr)) {
|
||||
pr_info("PF_BRIDGE: RTM_DELNEIGH with invalid ether address\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
err = -EOPNOTSUPP;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user