diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-21 10:47:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-21 10:47:40 +0100 |
| commit | 42e405f7b1d252c90a2468dd2140f47b8142b7a0 (patch) | |
| tree | baeda52d8726fe694d3344a0d0fda1dadc30a901 /net/switchdev/switchdev.c | |
| parent | e9532e69b8d1d1284e8ecf8d2586de34aec61244 (diff) | |
| parent | 710d60cbf1b312a8075a2158cbfbbd9c66132dcc (diff) | |
| download | linux-42e405f7b1d252c90a2468dd2140f47b8142b7a0.tar.gz linux-42e405f7b1d252c90a2468dd2140f47b8142b7a0.tar.bz2 linux-42e405f7b1d252c90a2468dd2140f47b8142b7a0.zip | |
Merge branch 'linus' into sched/urgent, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/switchdev/switchdev.c')
| -rw-r--r-- | net/switchdev/switchdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 47f7da58a7f0..8b5833c1ff2e 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -1093,8 +1093,11 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb, .cb = cb, .idx = idx, }; + int err; - switchdev_port_obj_dump(dev, &dump.fdb.obj, switchdev_port_fdb_dump_cb); + err = switchdev_port_obj_dump(dev, &dump.fdb.obj, + switchdev_port_fdb_dump_cb); + cb->args[1] = err; return dump.idx; } EXPORT_SYMBOL_GPL(switchdev_port_fdb_dump); |