summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-02-23 10:37:52 +0100
committerDavid S. Miller <davem@davemloft.net>2016-02-23 19:12:31 +0100
commita30a9ea6e21b495372aff549f3dfd63198bd1f45 (patch)
tree5a2b6302b23b1dcbf1176163829ef501b1f9babe
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-a30a9ea6e21b495372aff549f3dfd63198bd1f45.tar.xz
linux-a30a9ea6e21b495372aff549f3dfd63198bd1f45.zip
rocker: fix rocker_world_port_obj_vlan_add()
We were changing return values and accidentally made rocker_world_port_obj_vlan_add() into a no-op. Fixes: fccd84d44912 ('rocker: return -EOPNOTSUPP for undefined world ops') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/rocker/rocker_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index acafbf870182..28b775e5a9ad 100644
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -1598,7 +1598,6 @@ rocker_world_port_obj_vlan_add(struct rocker_port *rocker_port,
if (!wops->port_obj_vlan_add)
return -EOPNOTSUPP;
- return 0;
return wops->port_obj_vlan_add(rocker_port, vlan, trans);
}