diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-06-23 14:17:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-23 14:17:31 -0400 |
| commit | 93bbbfbb4a5aa32a2375a86f3a23e48ea75e05db (patch) | |
| tree | fd34e9c7e0485615e63e0608cf81f9dfc62a1582 /net/xfrm/xfrm_device.c | |
| parent | Merge branch 'ena-new-features-and-improvements' (diff) | |
| parent | xfrm: add UDP encapsulation port in migrate message (diff) | |
| download | linux-dev-93bbbfbb4a5aa32a2375a86f3a23e48ea75e05db.tar.xz linux-dev-93bbbfbb4a5aa32a2375a86f3a23e48ea75e05db.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-06-23
1) Use memdup_user to spmlify xfrm_user_policy.
From Geliang Tang.
2) Make xfrm_dev_register static to silence a sparse warning.
From Wei Yongjun.
3) Use crypto_memneq to check the ICV in the AH protocol.
From Sabrina Dubroca.
4) Remove some unused variables in esp6.
From Stephen Hemminger.
5) Extend XFRM MIGRATE to allow to change the UDP encapsulation port.
From Antony Antony.
6) Include the UDP encapsulation port to km_migrate announcements.
From Antony Antony.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c index 574e6f32f94f..6d4a60d1bf19 100644 --- a/net/xfrm/xfrm_device.c +++ b/net/xfrm/xfrm_device.c @@ -138,7 +138,7 @@ ok: } EXPORT_SYMBOL_GPL(xfrm_dev_offload_ok); -int xfrm_dev_register(struct net_device *dev) +static int xfrm_dev_register(struct net_device *dev) { if ((dev->features & NETIF_F_HW_ESP) && !dev->xfrmdev_ops) return NOTIFY_BAD; |