mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
Merge ../vxlan-x
This commit is contained in:
commit
3f5d6af094
3 changed files with 365 additions and 222 deletions
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 a new issue