diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-27 15:40:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-27 15:40:03 +0100 |
| commit | dc1632321ba1e93dde25870e96cebe21b7d52517 (patch) | |
| tree | d52d934c79b23f91654c571d983e1a6ec41b71fd /net/core/rtnetlink.c | |
| parent | 8c193b8dce4f2a2474dc2bc39ec972454df9d439 (diff) | |
| parent | a85f9da707366e856c0aad9e329db0cc59475290 (diff) | |
Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 3de740834d1..ca198c1d1d3 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2156,7 +2156,7 @@ int ndo_dflt_fdb_del(struct ndmsg *ndm, /* If aging addresses are supported device will need to * implement its own handler for this. */ - if (ndm->ndm_state & NUD_PERMANENT) { + if (!(ndm->ndm_state & NUD_PERMANENT)) { pr_info("%s: FDB only supports static addresses\n", dev->name); return -EINVAL; } @@ -2384,7 +2384,7 @@ static int rtnl_bridge_getlink(struct sk_buff *skb, struct netlink_callback *cb) struct nlattr *extfilt; u32 filter_mask = 0; - extfilt = nlmsg_find_attr(cb->nlh, sizeof(struct rtgenmsg), + extfilt = nlmsg_find_attr(cb->nlh, sizeof(struct ifinfomsg), IFLA_EXT_MASK); if (extfilt) filter_mask = nla_get_u32(extfilt); |