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

Commit aec15924 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

openvswitch: Use dev_queue_xmit for vport send. 



With use of lwtunnel, we can directly call dev_queue_xmit()
rather than calling netdev vport send operation.
Following change make tunnel vport code bit cleaner.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Acked-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99e28f18

net/openvswitch/vport-geneve.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static struct vport_ops ovs_geneve_vport_ops = { 
	.create		= geneve_create,

	.destroy	= ovs_netdev_tunnel_destroy,

	.get_options	= geneve_get_options,

	.send		= ovs_netdev_send,

	.send		= dev_queue_xmit,

	.owner          = THIS_MODULE,

	.get_egress_tun_info	= geneve_get_egress_tun_info,

};

net/openvswitch/vport-gre.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int gre_get_egress_tun_info(struct vport *vport, struct sk_buff *skb, 
static struct vport_ops ovs_gre_vport_ops = {

	.type		= OVS_VPORT_TYPE_GRE,

	.create		= gre_create,

	.send		= ovs_netdev_send,

	.send		= dev_queue_xmit,

	.get_egress_tun_info	= gre_get_egress_tun_info,

	.destroy	= ovs_netdev_tunnel_destroy,

	.owner		= THIS_MODULE,

net/openvswitch/vport-internal_dev.c

+4 −4
Original line number Diff line number Diff line
@@ -202,22 +202,21 @@ static void internal_dev_destroy(struct vport *vport) 
	rtnl_unlock();

}



static void internal_dev_recv(struct vport *vport, struct sk_buff *skb)

static netdev_tx_t internal_dev_recv(struct sk_buff *skb)

{

	struct net_device *netdev = vport->dev;

	struct net_device *netdev = skb->dev;

	struct pcpu_sw_netstats *stats;



	if (unlikely(!(netdev->flags & IFF_UP))) {

		kfree_skb(skb);

		netdev->stats.rx_dropped++;

		return;

		return NETDEV_TX_OK;

	}



	skb_dst_drop(skb);

	nf_reset(skb);

	secpath_reset(skb);



	skb->dev = netdev;

	skb->pkt_type = PACKET_HOST;

	skb->protocol = eth_type_trans(skb, netdev);

	skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
@@ -229,6 +228,7 @@ static void internal_dev_recv(struct vport *vport, struct sk_buff *skb) 
	u64_stats_update_end(&stats->syncp);



	netif_rx(skb);

	return NETDEV_TX_OK;

}



static struct vport_ops ovs_internal_vport_ops = {

net/openvswitch/vport-netdev.c

+1 −32
Original line number Diff line number Diff line
@@ -190,37 +190,6 @@ void ovs_netdev_tunnel_destroy(struct vport *vport) 
}

EXPORT_SYMBOL_GPL(ovs_netdev_tunnel_destroy);



static unsigned int packet_length(const struct sk_buff *skb)

{

	unsigned int length = skb->len - ETH_HLEN;



	if (skb->protocol == htons(ETH_P_8021Q))

		length -= VLAN_HLEN;



	return length;

}



void ovs_netdev_send(struct vport *vport, struct sk_buff *skb)

{

	int mtu = vport->dev->mtu;



	if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) {

		net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n",

				     vport->dev->name,

				     packet_length(skb), mtu);

		vport->dev->stats.tx_errors++;

		goto drop;

	}



	skb->dev = vport->dev;

	dev_queue_xmit(skb);

	return;



drop:

	kfree_skb(skb);

}

EXPORT_SYMBOL_GPL(ovs_netdev_send);



/* Returns null if this device is not attached to a datapath. */

struct vport *ovs_netdev_get_vport(struct net_device *dev)

{
@@ -235,7 +204,7 @@ static struct vport_ops ovs_netdev_vport_ops = { 
	.type		= OVS_VPORT_TYPE_NETDEV,

	.create		= netdev_create,

	.destroy	= netdev_destroy,

	.send		= ovs_netdev_send,

	.send		= dev_queue_xmit,

};



int __init ovs_netdev_init(void)

net/openvswitch/vport-netdev.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
struct vport *ovs_netdev_get_vport(struct net_device *dev);



struct vport *ovs_netdev_link(struct vport *vport, const char *name);

void ovs_netdev_send(struct vport *vport, struct sk_buff *skb);

void ovs_netdev_detach_dev(struct vport *);



int __init ovs_netdev_init(void);