diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-26 16:22:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-26 16:22:53 +0100 |
| commit | a81e4affe1789a3d1010f219ad53382a760aa2ea (patch) | |
| tree | 73ea99e882beec7435f49b370ef5d8527ac361ef /net/xfrm/xfrm_device.c | |
| parent | sfc: add suffix to large constant in ptp (diff) | |
| parent | xfrm: Add ESN support for IPSec HW offload (diff) | |
| download | linux-a81e4affe1789a3d1010f219ad53382a760aa2ea.tar.xz linux-a81e4affe1789a3d1010f219ad53382a760aa2ea.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 2018-01-26
One last patch for this development cycle:
1) Add ESN support for IPSec HW offload.
From Yossef Efraim.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_device.c')
| -rw-r--r-- | net/xfrm/xfrm_device.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c index 92b4648e75ca..8e70291e586a 100644 --- a/net/xfrm/xfrm_device.c +++ b/net/xfrm/xfrm_device.c @@ -147,8 +147,8 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, if (!x->type_offload) return -EINVAL; - /* We don't yet support UDP encapsulation, TFC padding and ESN. */ - if (x->encap || x->tfcpad || (x->props.flags & XFRM_STATE_ESN)) + /* We don't yet support UDP encapsulation and TFC padding. */ + if (x->encap || x->tfcpad) return -EINVAL; dev = dev_get_by_index(net, xuo->ifindex); @@ -178,6 +178,13 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, return 0; } + if (x->props.flags & XFRM_STATE_ESN && + !dev->xfrmdev_ops->xdo_dev_state_advance_esn) { + xso->dev = NULL; + dev_put(dev); + return -EINVAL; + } + xso->dev = dev; xso->num_exthdrs = 1; xso->flags = xuo->flags; |