Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2019-09-15 14:17:27 +02:00
commit aa2eaa8c27
159 changed files with 1670 additions and 1375 deletions

View file

@ -1339,7 +1339,7 @@ static int __net_init sctp_ctrlsock_init(struct net *net)
return status;
}
static void __net_init sctp_ctrlsock_exit(struct net *net)
static void __net_exit sctp_ctrlsock_exit(struct net *net)
{
/* Free the control endpoint. */
inet_ctl_sock_destroy(net->sctp.ctl_sock);