diff options
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/vport-netdev.c | 3 | ||||
| -rw-r--r-- | net/openvswitch/vport.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index 670cbc3518de..2130d61c384a 100644 --- a/net/openvswitch/vport-netdev.c +++ b/net/openvswitch/vport-netdev.c | |||
| @@ -43,8 +43,7 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) | |||
| 43 | 43 | ||
| 44 | /* Make our own copy of the packet. Otherwise we will mangle the | 44 | /* Make our own copy of the packet. Otherwise we will mangle the |
| 45 | * 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). |
| 46 | * (No one comes after us, since we tell handle_bridge() that we took | 46 | */ |
| 47 | * the packet.) */ | ||
| 48 | skb = skb_share_check(skb, GFP_ATOMIC); | 47 | skb = skb_share_check(skb, GFP_ATOMIC); |
| 49 | if (unlikely(!skb)) | 48 | if (unlikely(!skb)) |
| 50 | return; | 49 | return; |
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 70af0bedbac4..6255e48e64c4 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c | |||
| @@ -326,8 +326,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb) | |||
| 326 | * @skb: skb that was received | 326 | * @skb: skb that was received |
| 327 | * | 327 | * |
| 328 | * Must be called with rcu_read_lock. The packet cannot be shared and | 328 | * Must be called with rcu_read_lock. The packet cannot be shared and |
| 329 | * skb->data should point to the Ethernet header. The caller must have already | 329 | * skb->data should point to the Ethernet header. |
| 330 | * called compute_ip_summed() to initialize the checksumming fields. | ||
| 331 | */ | 330 | */ |
| 332 | void ovs_vport_receive(struct vport *vport, struct sk_buff *skb) | 331 | void ovs_vport_receive(struct vport *vport, struct sk_buff *skb) |
| 333 | { | 332 | { |
