diff options
author | David S. Miller <davem@davemloft.net> | 2020-06-26 04:29:51 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-06-26 04:29:51 +0200 |
commit | 7bed14551659875e1cd23a7c0266394a29a773b3 (patch) | |
tree | 2bbd8b1b2b1610d2e48a71bf7bb5f41ac5e1d0ef /net/ipv6/fou6.c | |
parent | sch_cake: add RFC 8622 LE PHB support to CAKE diffserv handling (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | linux-7bed14551659875e1cd23a7c0266394a29a773b3.tar.xz linux-7bed14551659875e1cd23a7c0266394a29a773b3.zip |
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 'net/ipv6/fou6.c')
-rw-r--r-- | net/ipv6/fou6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/fou6.c b/net/ipv6/fou6.c index 091f94184dc1..430518ae26fa 100644 --- a/net/ipv6/fou6.c +++ b/net/ipv6/fou6.c @@ -224,3 +224,4 @@ module_init(fou6_init); module_exit(fou6_fini); MODULE_AUTHOR("Tom Herbert <therbert@google.com>"); MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Foo over UDP (IPv6)"); |