diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2017-12-20 10:41:31 +0100 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2017-12-20 10:41:31 +0100 |
| commit | 3dca3f38cfb8efb8571040568cac7d0025fa5bb1 (patch) | |
| tree | e1227751f873bae8a696222da5d9d3d1a1e070b9 /net/ipv4/xfrm4_mode_tunnel.c | |
| parent | f39a5c01c3d24f2f61ec9d8c7d7e81f9aca506ce (diff) | |
| download | linux-stable-3dca3f38cfb8efb8571040568cac7d0025fa5bb1.tar.gz linux-stable-3dca3f38cfb8efb8571040568cac7d0025fa5bb1.tar.bz2 linux-stable-3dca3f38cfb8efb8571040568cac7d0025fa5bb1.zip | |
xfrm: Separate ESP handling from segmentation for GRO packets.
We change the ESP GSO handlers to only segment the packets.
The ESP handling and encryption is defered to validate_xmit_xfrm()
where this is done for non GRO packets too. This makes the code
more robust and prepares for asynchronous crypto handling.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
| -rw-r--r-- | net/ipv4/xfrm4_mode_tunnel.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index 7d885a44dc9d..8affc6d83d58 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c @@ -105,18 +105,15 @@ static struct sk_buff *xfrm4_mode_tunnel_gso_segment(struct xfrm_state *x, { __skb_push(skb, skb->mac_len); return skb_mac_gso_segment(skb, features); - } static void xfrm4_mode_tunnel_xmit(struct xfrm_state *x, struct sk_buff *skb) { struct xfrm_offload *xo = xfrm_offload(skb); - if (xo->flags & XFRM_GSO_SEGMENT) { - skb->network_header = skb->network_header - x->props.header_len; + if (xo->flags & XFRM_GSO_SEGMENT) skb->transport_header = skb->network_header + sizeof(struct iphdr); - } skb_reset_mac_len(skb); pskb_pull(skb, skb->mac_len + x->props.header_len); |