Commit ff269e2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-next-6.7-followup' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 

Pull more networking updates from Jakub Kicinski:

 - Support GRO decapsulation for IPsec ESP in UDP

 - Add a handful of MODULE_DESCRIPTION()s

 - Drop questionable alignment check in TCP AO to avoid
   build issue after changes in the crypto tree

* tag 'net-next-6.7-followup' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next:
  net: tcp: remove call to obsolete crypto_ahash_alignmask()
  net: fill in MODULE_DESCRIPTION()s under drivers/net/
  net: fill in MODULE_DESCRIPTION()s under net/802*
  net: fill in MODULE_DESCRIPTION()s under net/core
  net: fill in MODULE_DESCRIPTION()s in kuba@'s modules
  xfrm: policy: fix layer 4 flowi decoding
  xfrm Fix use after free in __xfrm6_udp_encap_rcv.
  xfrm: policy: replace session decode with flow dissector
  xfrm: move mark and oif flowi decode into common code
  xfrm: pass struct net to xfrm_decode_session wrappers
  xfrm: Support GRO for IPv6 ESP in UDP encapsulation
  xfrm: Support GRO for IPv4 ESP in UDP encapsulation
  xfrm: Use the XFRM_GRO to indicate a GRO call on input
  xfrm: Annotate struct xfrm_sec_ctx with __counted_by
  xfrm: Remove unused function declarations
parents 05bf73aa f2fbb908

drivers/net/amt.c

+1 −0
Original line number Diff line number Diff line
@@ -3449,5 +3449,6 @@ static void __exit amt_fini(void) 
module_exit(amt_fini);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Driver for Automatic Multicast Tunneling (AMT)");

MODULE_AUTHOR("Taehee Yoo <ap420073@gmail.com>");

MODULE_ALIAS_RTNL_LINK("amt");

drivers/net/dummy.c

+1 −0
Original line number Diff line number Diff line
@@ -202,4 +202,5 @@ static void __exit dummy_cleanup_module(void) 
module_init(dummy_init_module);

module_exit(dummy_cleanup_module);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Dummy netdevice driver which discards all packets sent to it");

MODULE_ALIAS_RTNL_LINK(DRV_NAME);

drivers/net/eql.c

+1 −0
Original line number Diff line number Diff line
@@ -607,4 +607,5 @@ static void __exit eql_cleanup_module(void) 


module_init(eql_init_module);

module_exit(eql_cleanup_module);

MODULE_DESCRIPTION("Equalizer Load-balancer for serial network interfaces");

MODULE_LICENSE("GPL");

drivers/net/ifb.c

+1 −0
Original line number Diff line number Diff line
@@ -454,5 +454,6 @@ static void __exit ifb_cleanup_module(void) 
module_init(ifb_init_module);

module_exit(ifb_cleanup_module);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Intermediate Functional Block (ifb) netdevice driver for sharing of resources and ingress packet queuing");

MODULE_AUTHOR("Jamal Hadi Salim");

MODULE_ALIAS_RTNL_LINK("ifb");

drivers/net/macvtap.c

+1 −0
Original line number Diff line number Diff line
@@ -250,5 +250,6 @@ static void __exit macvtap_exit(void) 
module_exit(macvtap_exit);



MODULE_ALIAS_RTNL_LINK("macvtap");

MODULE_DESCRIPTION("MAC-VLAN based tap driver");

MODULE_AUTHOR("Arnd Bergmann <arnd@arndb.de>");

MODULE_LICENSE("GPL");