diff options
Diffstat (limited to 'net/dcb/dcbnl.c')
-rw-r--r-- | net/dcb/dcbnl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index ac1205df6c86..db9f5b39388f 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c | |||
@@ -1085,8 +1085,8 @@ static int dcbnl_bcn_setcfg(struct net_device *netdev, struct nlattr **tb, | |||
1085 | u8 value_byte; | 1085 | u8 value_byte; |
1086 | u32 value_int; | 1086 | u32 value_int; |
1087 | 1087 | ||
1088 | if (!tb[DCB_ATTR_BCN] || !netdev->dcbnl_ops->setbcncfg | 1088 | if (!tb[DCB_ATTR_BCN] || !netdev->dcbnl_ops->setbcncfg || |
1089 | || !netdev->dcbnl_ops->setbcnrp) | 1089 | !netdev->dcbnl_ops->setbcnrp) |
1090 | return ret; | 1090 | return ret; |
1091 | 1091 | ||
1092 | ret = nla_parse_nested(data, DCB_BCN_ATTR_MAX, | 1092 | ret = nla_parse_nested(data, DCB_BCN_ATTR_MAX, |
@@ -1126,7 +1126,7 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
1126 | u32 pid = skb ? NETLINK_CB(skb).pid : 0; | 1126 | u32 pid = skb ? NETLINK_CB(skb).pid : 0; |
1127 | int ret = -EINVAL; | 1127 | int ret = -EINVAL; |
1128 | 1128 | ||
1129 | if (net != &init_net) | 1129 | if (!net_eq(net, &init_net)) |
1130 | return -EINVAL; | 1130 | return -EINVAL; |
1131 | 1131 | ||
1132 | ret = nlmsg_parse(nlh, sizeof(*dcb), tb, DCB_ATTR_MAX, | 1132 | ret = nlmsg_parse(nlh, sizeof(*dcb), tb, DCB_ATTR_MAX, |