History

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. ====================

David S. Miller committed 13 years ago

Commit 6cddded2 parents 0c35565 d9d59081 file · +9 −7Browse files

Unified · Split

net/openvswitch/vport-netdev.c+9−7
@@ -35,10 +35,11 @@ · 34 unmodified lines
35/* Must be called with rcu_read_lock. */35/* Must be called with rcu_read_lock. */
36static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)36static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
37{37{
38 if (unlikely(!vport)) {38 if (unlikely(!vport))
39 kfree_skb(skb);39 goto error;
40 return;40
41 }41 if (unlikely(skb_warn_if_lro(skb)))
42 goto error;
42 43
43 /* Make our own copy of the packet. Otherwise we will mangle the44 /* Make our own copy of the packet. Otherwise we will mangle the
44 * packet for anyone who came before us (e.g. tcpdump via AF_PACKET).45 * 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) · 5 unmodified lines
50 51
51 skb_push(skb, ETH_HLEN);52 skb_push(skb, ETH_HLEN);
52 ovs_vport_receive(vport, skb);53 ovs_vport_receive(vport, skb);
54 return;
55
56error:
57 kfree_skb(skb);
53}58}
54 59
55/* Called with rcu_read_lock and bottom-halves disabled. */60/* Called with rcu_read_lock and bottom-halves disabled. */
@@ -169,9 +174,6 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb) · 113 unmodified lines
169 goto error;174 goto error;
170 }175 }
171 176
172 if (unlikely(skb_warn_if_lro(skb)))
173 goto error;
174
175 skb->dev = netdev_vport->dev;177 skb->dev = netdev_vport->dev;
176 len = skb->len;178 len = skb->len;
177 dev_queue_xmit(skb);179 dev_queue_xmit(skb);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t