diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/bridge/br_netlink.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/bridge/br_netlink.c')
| -rw-r--r-- | net/bridge/br_netlink.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 26edb518b839..cb5fcf62f663 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c | |||
| @@ -208,7 +208,6 @@ int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, | |||
| 208 | int err = 0; | 208 | int err = 0; |
| 209 | struct net_bridge_port *port = br_port_get_rtnl(dev); | 209 | struct net_bridge_port *port = br_port_get_rtnl(dev); |
| 210 | 210 | ||
| 211 | /* not a bridge port and */ | ||
| 212 | if (!port && !(filter_mask & RTEXT_FILTER_BRVLAN)) | 211 | if (!port && !(filter_mask & RTEXT_FILTER_BRVLAN)) |
| 213 | goto out; | 212 | goto out; |
| 214 | 213 | ||