diff options
Diffstat (limited to 'net/ipv6/xfrm6_mode_beet.c')
-rw-r--r-- | net/ipv6/xfrm6_mode_beet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c index edcfffa9e87b..53cfe1a10ccd 100644 --- a/net/ipv6/xfrm6_mode_beet.c +++ b/net/ipv6/xfrm6_mode_beet.c | |||
@@ -59,6 +59,7 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) | |||
59 | static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb) | 59 | static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb) |
60 | { | 60 | { |
61 | struct ipv6hdr *ip6h; | 61 | struct ipv6hdr *ip6h; |
62 | const unsigned char *old_mac; | ||
62 | int size = sizeof(struct ipv6hdr); | 63 | int size = sizeof(struct ipv6hdr); |
63 | int err = -EINVAL; | 64 | int err = -EINVAL; |
64 | 65 | ||
@@ -69,8 +70,9 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb) | |||
69 | memmove(skb->data, skb->nh.raw, size); | 70 | memmove(skb->data, skb->nh.raw, size); |
70 | skb->nh.raw = skb->data; | 71 | skb->nh.raw = skb->data; |
71 | 72 | ||
72 | skb->mac.raw = memmove(skb->data - skb->mac_len, | 73 | old_mac = skb->mac.raw; |
73 | skb->mac.raw, skb->mac_len); | 74 | skb_set_mac_header(skb, -skb->mac_len); |
75 | memmove(skb->mac.raw, old_mac, skb->mac_len); | ||
74 | 76 | ||
75 | ip6h = skb->nh.ipv6h; | 77 | ip6h = skb->nh.ipv6h; |
76 | ip6h->payload_len = htons(skb->len - size); | 78 | ip6h->payload_len = htons(skb->len - size); |