diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-04 15:17:52 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-04 15:17:52 -0400 |
| commit | 9d148e39d1a031f0aced8467de2a81fcf576ba50 (patch) | |
| tree | 58772e41bf685157f207ec099131ecf9fff6f16f /net/openvswitch/actions.c | |
| parent | b320e97240de0f98b81f866d59f47af41780eab0 (diff) | |
| parent | c303aa94cdae483a7577230e61720e126e600a52 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index f3f96badf5aa..954405ceae9e 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c | |||
| @@ -45,7 +45,7 @@ static int make_writable(struct sk_buff *skb, int write_len) | |||
| 45 | return pskb_expand_head(skb, 0, 0, GFP_ATOMIC); | 45 | return pskb_expand_head(skb, 0, 0, GFP_ATOMIC); |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | /* remove VLAN header from packet and update csum accrodingly. */ | 48 | /* remove VLAN header from packet and update csum accordingly. */ |
| 49 | static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) | 49 | static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) |
| 50 | { | 50 | { |
| 51 | struct vlan_hdr *vhdr; | 51 | struct vlan_hdr *vhdr; |