diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-25 19:29:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-25 19:29:51 -0700 |
| commit | 7bed14551659875e1cd23a7c0266394a29a773b3 (patch) | |
| tree | 2bbd8b1b2b1610d2e48a71bf7bb5f41ac5e1d0ef /include/net/xfrm.h | |
| parent | b8392808eb3fc28e523e28cb258c81ca246deb9b (diff) | |
| parent | 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes in xfrm_device.c, between the double
ESP trailing bug fix setting the XFRM_INIT flag and the changes
in net-next preparing for bonding encryption support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index e648c9e6c919..f9e1fda82ddf 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1009,6 +1009,7 @@ struct xfrm_offload { #define XFRM_GRO 32 #define XFRM_ESP_NO_TRAILER 64 #define XFRM_DEV_RESUME 128 +#define XFRM_XMIT 256 __u32 status; #define CRYPTO_SUCCESS 1 |