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

Commit 6cddded4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixes' of... 

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

 into openvswitch

Jesse Gross says:

====================
One bug fix for net/3.8 for a long standing problem that was reported a few
times recently.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0c35565b d9d59089

net/openvswitch/vport-netdev.c

+9 −7
Original line number Diff line number Diff line
@@ -35,10 +35,11 @@ 
/* Must be called with rcu_read_lock. */

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

{

	if (unlikely(!vport)) {

		kfree_skb(skb);

		return;

	}

	if (unlikely(!vport))

		goto error;



	if (unlikely(skb_warn_if_lro(skb)))

		goto error;



	/* Make our own copy of the packet.  Otherwise we will mangle the

	 * packet for anyone who came before us (e.g. tcpdump via AF_PACKET).
@@ -50,6 +51,10 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) 


	skb_push(skb, ETH_HLEN);

	ovs_vport_receive(vport, skb);

	return;



error:

	kfree_skb(skb);

}



/* Called with rcu_read_lock and bottom-halves disabled. */
@@ -169,9 +174,6 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb) 
		goto error;

	}



	if (unlikely(skb_warn_if_lro(skb)))

		goto error;



	skb->dev = netdev_vport->dev;

	len = skb->len;

	dev_queue_xmit(skb);