Merge pull request #2 from vcaputo/v4.2.2-coreos-switchdev_idx_fixes

switchdev: fix return value of switchdev_port_fdb_dump() errors
coreos · Nov 17, 2015 · 7a17ede · 7a17ede
2 parents cfc0008 + d5eda9e
commit 7a17ede
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
@@ -268,7 +268,7 @@ static inline int switchdev_port_fdb_dump(struct sk_buff *skb,
 					  struct net_device *filter_dev,
 					  int idx)
 {
-	return -EOPNOTSUPP;
+       return idx;
 }
 
 #endif

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
@@ -853,12 +853,8 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
 		.cb = cb,
 		.idx = idx,
 	};
-	int err;
-
-	err = switchdev_port_obj_dump(dev, &dump.obj);
-	if (err)
-		return err;
 
+	switchdev_port_obj_dump(dev, &dump.obj);
 	return dump.idx;
 }
 EXPORT_SYMBOL_GPL(switchdev_port_fdb_dump);