diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-12 03:02:55 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-12 03:02:55 +0400 |
| commit | 902455e00720018d1dbd38327c3fd5bda6d844ee (patch) | |
| tree | 02fc906c5bc318220ad4827c6eac2521b9d1fbbf /net/core/skbuff.c | |
| parent | 39f33367e420d88b3cbbd474e5bcc326338ef324 (diff) | |
| parent | c5b46160877a9bb23ab6f96fb666e7766f407704 (diff) | |
| download | linux-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/core/rtnetlink.c
net/core/skbuff.c
Both conflicts were very simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b9e85e6cb26a..bf92824af3f7 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2885,6 +2885,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, int pos; int dummy; + __skb_push(head_skb, doffset); proto = skb_network_protocol(head_skb, &dummy); if (unlikely(!proto)) return ERR_PTR(-EINVAL); @@ -2892,7 +2893,6 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, csum = !head_skb->encap_hdr_csum && !!can_checksum_protocol(features, proto); - __skb_push(head_skb, doffset); headroom = skb_headroom(head_skb); pos = skb_headlen(head_skb); |