Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2537b4dd authored by Jiri Pirko's avatar Jiri Pirko Committed by Jesse Gross
Browse files

openvswitch:: link upper device for port devices 



Link upper device properly. That will make IFLA_MASTER filled up.
Set the master to port 0 of the datapath under which the port belongs.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 76a66c7e

net/openvswitch/vport-netdev.c

+19 −1
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/llc.h>

#include <linux/llc.h>

#include <linux/rtnetlink.h>

#include <linux/rtnetlink.h>

#include <linux/skbuff.h>

#include <linux/skbuff.h>

#include <linux/openvswitch.h>





#include <net/llc.h>

#include <net/llc.h>
@@ -74,6 +75,15 @@ static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb) 
	return RX_HANDLER_CONSUMED;

	return RX_HANDLER_CONSUMED;

}

}





static struct net_device *get_dpdev(struct datapath *dp)

{

	struct vport *local;



	local = ovs_vport_ovsl(dp, OVSP_LOCAL);

	BUG_ON(!local);

	return netdev_vport_priv(local)->dev;

}



static struct vport *netdev_create(const struct vport_parms *parms)

static struct vport *netdev_create(const struct vport_parms *parms)

{

{

	struct vport *vport;

	struct vport *vport;
@@ -103,10 +113,15 @@ static struct vport *netdev_create(const struct vport_parms *parms) 
	}

	}





	rtnl_lock();

	rtnl_lock();

	err = netdev_master_upper_dev_link(netdev_vport->dev,

					   get_dpdev(vport->dp));

	if (err)

		goto error_unlock;



	err = netdev_rx_handler_register(netdev_vport->dev, netdev_frame_hook,

	err = netdev_rx_handler_register(netdev_vport->dev, netdev_frame_hook,

					 vport);

					 vport);

	if (err)

	if (err)

		goto error_unlock;

		goto error_master_upper_dev_unlink;





	dev_set_promiscuity(netdev_vport->dev, 1);

	dev_set_promiscuity(netdev_vport->dev, 1);

	netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH;

	netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH;
@@ -114,6 +129,8 @@ static struct vport *netdev_create(const struct vport_parms *parms) 




	return vport;

	return vport;





error_master_upper_dev_unlink:

	netdev_upper_dev_unlink(netdev_vport->dev, get_dpdev(vport->dp));

error_unlock:

error_unlock:

	rtnl_unlock();

	rtnl_unlock();

error_put:

error_put:
@@ -140,6 +157,7 @@ static void netdev_destroy(struct vport *vport) 
	rtnl_lock();

	rtnl_lock();

	netdev_vport->dev->priv_flags &= ~IFF_OVS_DATAPATH;

	netdev_vport->dev->priv_flags &= ~IFF_OVS_DATAPATH;

	netdev_rx_handler_unregister(netdev_vport->dev);

	netdev_rx_handler_unregister(netdev_vport->dev);

	netdev_upper_dev_unlink(netdev_vport->dev, get_dpdev(vport->dp));

	dev_set_promiscuity(netdev_vport->dev, -1);

	dev_set_promiscuity(netdev_vport->dev, -1);

	rtnl_unlock();

	rtnl_unlock();