lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2013-02-07 23:37:36 -05:00
parent 0c35565b46 d9d59089c4
commit 6cddded4af
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/openvswitch/vport-netdev.c
View File

@@ -35,10 +35,11 @@
/* Must be called with rcu_read_lock. */ /* Must be called with rcu_read_lock. */
static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
{ {
if (unlikely(!vport)) { if (unlikely(!vport))
kfree_skb(skb); goto error;
return;
} if (unlikely(skb_warn_if_lro(skb)))
goto error;
/* Make our own copy of the packet. Otherwise we will mangle the /* 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). * 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); skb_push(skb, ETH_HLEN);
ovs_vport_receive(vport, skb); ovs_vport_receive(vport, skb);
return;
error:
kfree_skb(skb);
} }
/* Called with rcu_read_lock and bottom-halves disabled. */ /* 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; goto error;
} }
if (unlikely(skb_warn_if_lro(skb)))
goto error;
skb->dev = netdev_vport->dev; skb->dev = netdev_vport->dev;
len = skb->len; len = skb->len;
dev_queue_xmit(skb); dev_queue_xmit(skb);