diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-21 15:11:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-21 15:11:28 -0400 |
| commit | 6b633e82b0f902a4cceb9bcdcb5bb31d04ca6264 (patch) | |
| tree | 15f7953de0e6c05106313c6e01ee06cc2b3389f6 /net/core/dev.c | |
| parent | 77999328b5fbccca674b3d71a346289e17b4c7cf (diff) | |
| parent | 8f92e03ecca390beed3d5ccc81023d050f0369fd (diff) | |
| download | linux-6b633e82b0f902a4cceb9bcdcb5bb31d04ca6264.tar.gz linux-6b633e82b0f902a4cceb9bcdcb5bb31d04ca6264.tar.bz2 linux-6b633e82b0f902a4cceb9bcdcb5bb31d04ca6264.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2017-04-20
This adds the basic infrastructure for IPsec hardware
offloading, it creates a configuration API and adjusts
the packet path.
1) Add the needed netdev features to configure IPsec offloads.
2) Add the IPsec hardware offloading API.
3) Prepare the ESP packet path for hardware offloading.
4) Add gso handlers for esp4 and esp6, this implements
the software fallback for GSO packets.
5) Add xfrm replay handler functions for offloading.
6) Change ESP to use a synchronous crypto algorithm on
offloading, we don't have the option for asynchronous
returns when we handle IPsec at layer2.
7) Add a xfrm validate function to validate_xmit_skb. This
implements the software fallback for non GSO packets.
8) Set 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.
From Ilan Tayari.
9) Prepare the ESP GRO codepath for hardware offloading.
10) Fix incorrect null pointer check in esp6.
From Colin Ian King.
11) Fix for the GSO software fallback path to detect the
fallback correctly.
From Ilan Tayari.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 1c53c055b197..db6e31564d06 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2972,6 +2972,9 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device __skb_linearize(skb)) goto out_kfree_skb; + if (validate_xmit_xfrm(skb, features)) + goto out_kfree_skb; + /* If packet is not checksummed and device does not * support checksumming for this protocol, complete * checksumming here. |