From 43188c5552a2e2b41a05361527ec97a74b85f3e9 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Fri, 22 Feb 2013 19:41:26 +0800 Subject: [PATCH] --- yaml --- r: 361452 b: refs/heads/master c: d176ca2a48ff2b5d7becfacdcbd1d72c73bd22d1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/openvswitch/vport-netdev.c | 3 +-- trunk/net/openvswitch/vport.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 077ccc3cb6d2..0dae01d07bba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b024082b2b279af58e24ebd46e81777723d58da +refs/heads/master: d176ca2a48ff2b5d7becfacdcbd1d72c73bd22d1 diff --git a/trunk/net/openvswitch/vport-netdev.c b/trunk/net/openvswitch/vport-netdev.c index 670cbc3518de..2130d61c384a 100644 --- a/trunk/net/openvswitch/vport-netdev.c +++ b/trunk/net/openvswitch/vport-netdev.c @@ -43,8 +43,7 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) /* 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). - * (No one comes after us, since we tell handle_bridge() that we took - * the packet.) */ + */ skb = skb_share_check(skb, GFP_ATOMIC); if (unlikely(!skb)) return; diff --git a/trunk/net/openvswitch/vport.c b/trunk/net/openvswitch/vport.c index 70af0bedbac4..6255e48e64c4 100644 --- a/trunk/net/openvswitch/vport.c +++ b/trunk/net/openvswitch/vport.c @@ -326,8 +326,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb) * @skb: skb that was received * * Must be called with rcu_read_lock. The packet cannot be shared and - * skb->data should point to the Ethernet header. The caller must have already - * called compute_ip_summed() to initialize the checksumming fields. + * skb->data should point to the Ethernet header. */ void ovs_vport_receive(struct vport *vport, struct sk_buff *skb) {