aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch/vport-netdev.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2015-12-03 06:12:10 -0500
committerDavid S. Miller <davem@davemloft.net>2015-12-03 11:49:25 -0500
commit6dffb0447c25476f499d205dfceb1972e8dae919 (patch)
tree5f74b59c691acc6de6310aaa9a238da8fc6cdf25 /net/openvswitch/vport-netdev.c
parente0ba1414f310c83bf425fe26fa2cd5f1befcd6dc (diff)
net: propagate upper priv via netdev_master_upper_dev_link
Eliminate netdev_master_upper_dev_link_private and pass priv directly as a parameter of netdev_master_upper_dev_link. Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-netdev.c')
-rw-r--r--net/openvswitch/vport-netdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c
index b327368a3848..3ee3df1edeae 100644
--- a/net/openvswitch/vport-netdev.c
+++ b/net/openvswitch/vport-netdev.c
@@ -105,7 +105,7 @@ struct vport *ovs_netdev_link(struct vport *vport, const char *name)
105 105
106 rtnl_lock(); 106 rtnl_lock();
107 err = netdev_master_upper_dev_link(vport->dev, 107 err = netdev_master_upper_dev_link(vport->dev,
108 get_dpdev(vport->dp)); 108 get_dpdev(vport->dp), NULL);
109 if (err) 109 if (err)
110 goto error_unlock; 110 goto error_unlock;
111 111