diff options
author | Ido Schimmel <idosch@mellanox.com> | 2016-08-25 12:42:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-08-26 16:13:36 -0400 |
commit | 5c326ab49e5ee014ba5314c076fe9b93fd8b0406 (patch) | |
tree | 3962549215a66de837b0e1e8d0ec519b3e7f262a /net/switchdev/switchdev.c | |
parent | 2a313cdf1e6e4cc8cc3f16f976e1abfbdd0626fa (diff) |
switchdev: Support parent ID comparison for stacked devices
switchdev_port_same_parent_id() currently expects port netdevs, but we
need it to support stacked devices in the next patch, so drop the
NO_RECURSE flag.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev/switchdev.c')
-rw-r--r-- | net/switchdev/switchdev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 9e9012956993..2c683f24d557 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c | |||
@@ -1292,12 +1292,10 @@ bool switchdev_port_same_parent_id(struct net_device *a, | |||
1292 | struct switchdev_attr a_attr = { | 1292 | struct switchdev_attr a_attr = { |
1293 | .orig_dev = a, | 1293 | .orig_dev = a, |
1294 | .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID, | 1294 | .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID, |
1295 | .flags = SWITCHDEV_F_NO_RECURSE, | ||
1296 | }; | 1295 | }; |
1297 | struct switchdev_attr b_attr = { | 1296 | struct switchdev_attr b_attr = { |
1298 | .orig_dev = b, | 1297 | .orig_dev = b, |
1299 | .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID, | 1298 | .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID, |
1300 | .flags = SWITCHDEV_F_NO_RECURSE, | ||
1301 | }; | 1299 | }; |
1302 | 1300 | ||
1303 | if (switchdev_port_attr_get(a, &a_attr) || | 1301 | if (switchdev_port_attr_get(a, &a_attr) || |