diff options
| author | Anton Altaparmakov <anton@tuxera.com> | 2012-02-27 09:01:22 (GMT) |
|---|---|---|
| committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-27 09:01:22 (GMT) |
| commit | f621c5334396fd153cd882ea92466823b7e7b821 (patch) | |
| tree | 7b829cad44dc0e5003d7cacac3a7a1b128637083 /net/ipv4/xfrm4_mode_beet.c | |
| parent | 0afa1b62e33250d4777c5803a98ae69fbe872061 (diff) | |
| parent | 500dd2370e77c9551ba298bdeeb91b02d8402199 (diff) | |
| download | linux-fsl-qoriq-f621c5334396fd153cd882ea92466823b7e7b821.tar.xz | |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'net/ipv4/xfrm4_mode_beet.c')
| -rw-r--r-- | net/ipv4/xfrm4_mode_beet.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c index 6341818..e3db3f9 100644 --- a/net/ipv4/xfrm4_mode_beet.c +++ b/net/ipv4/xfrm4_mode_beet.c @@ -110,10 +110,7 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb) skb_push(skb, sizeof(*iph)); skb_reset_network_header(skb); - - memmove(skb->data - skb->mac_len, skb_mac_header(skb), - skb->mac_len); - skb_set_mac_header(skb, -skb->mac_len); + skb_mac_header_rebuild(skb); xfrm4_beet_make_header(skb); |