diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-08 05:43:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-08 05:43:30 -0400 |
| commit | 529801898b24544f93532217ce18a7ebbb2b8c4f (patch) | |
| tree | c51c8fd808e6cff15cabb1a9ac29be0661942384 /net/openvswitch/vport.c | |
| parent | b847d0501afec4c7b12eb276aec10a2834f953ea (diff) | |
| parent | 23995bbee01d75f09f72b1380bd6045a5b02947b (diff) | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Pull IBM zEnterprise EC12 support patchlet from Robert Richter.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/openvswitch/vport.c')
| -rw-r--r-- | net/openvswitch/vport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index ba717cc038b3..f6b8132ce4cb 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c | |||
| @@ -325,8 +325,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb) | |||
| 325 | * @skb: skb that was received | 325 | * @skb: skb that was received |
| 326 | * | 326 | * |
| 327 | * Must be called with rcu_read_lock. The packet cannot be shared and | 327 | * Must be called with rcu_read_lock. The packet cannot be shared and |
| 328 | * skb->data should point to the Ethernet header. The caller must have already | 328 | * skb->data should point to the Ethernet header. |
| 329 | * called compute_ip_summed() to initialize the checksumming fields. | ||
| 330 | */ | 329 | */ |
| 331 | void ovs_vport_receive(struct vport *vport, struct sk_buff *skb) | 330 | void ovs_vport_receive(struct vport *vport, struct sk_buff *skb) |
| 332 | { | 331 | { |