diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-04-05 06:56:47 -0400 | 
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-04-05 06:56:47 -0400 | 
| commit | 6ea7e3873e52902af9ee8c0837450fdb69d54140 (patch) | |
| tree | b291dad174446387a166763cfbf3dd351148ecbe /net/switchdev/switchdev.c | |
| parent | 5ddfe0858ea7848c5d4efe3f4319e7543522e0ee (diff) | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
Merge branch 'fixes-base' into fixes
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); | 
