diff options
| author | Ilan Tayari <ilant@mellanox.com> | 2017-04-14 10:07:39 +0200 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2017-04-14 10:07:39 +0200 |
| commit | f1bd7d659ef0ba0f18c6f6afe7bbbd2410acffa0 (patch) | |
| tree | eb0c800ea60b7701158ad68bc566f514ac11f15d /net/xfrm/xfrm_output.c | |
| parent | f6e27114a60a0afdec40db1bf7f6da37b565745a (diff) | |
| download | linux-f1bd7d659ef0ba0f18c6f6afe7bbbd2410acffa0.tar.gz linux-f1bd7d659ef0ba0f18c6f6afe7bbbd2410acffa0.tar.bz2 linux-f1bd7d659ef0ba0f18c6f6afe7bbbd2410acffa0.zip | |
xfrm: Add encapsulation header offsets while SKB is not encrypted
Both esp4 and esp6 used to assume that the SKB payload is encrypted
and therefore the inner_network and inner_transport offsets are
not relevant.
When doing crypto offload in the NIC, this is no longer the case
and the NIC driver needs these offsets so it can do TX TCP checksum
offloading.
This patch sets the inner_network and inner_transport members of
the SKB, as well as encapsulation, to reflect the actual positions
of these headers, and removes them only once encryption is done
on the payload.
Signed-off-by: Ilan Tayari <ilant@mellanox.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm/xfrm_output.c')
| -rw-r--r-- | net/xfrm/xfrm_output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index a15088613a6c..8c0b6722aaa8 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -205,6 +205,7 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb) int err; secpath_reset(skb); + skb->encapsulation = 0; if (xfrm_dev_offload_ok(skb, x)) { struct sec_path *sp; @@ -218,6 +219,7 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb) if (skb->sp) secpath_put(skb->sp); skb->sp = sp; + skb->encapsulation = 1; sp->olen++; sp->xvec[skb->sp->len++] = x; |