Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed0ef967 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.65 into android11-5.4-lts 



Changes in 5.4.65
	ipv4: Silence suspicious RCU usage warning
	ipv6: Fix sysctl max for fib_multipath_hash_policy
	netlabel: fix problems with mapping removal
	net: usb: dm9601: Add USB ID of Keenetic Plus DSL
	sctp: not disable bh in the whole sctp_get_port_local()
	taprio: Fix using wrong queues in gate mask
	tipc: fix shutdown() of connectionless socket
	net: disable netpoll on fresh napis
	Linux 5.4.65

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie8ba6eb931d756c125c2966594061b4f9edb1795
parents a3775e2a 6c3d34de

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 64

SUBLEVEL = 65

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/net/usb/dm9601.c

+4 −0
Original line number Diff line number Diff line
@@ -625,6 +625,10 @@ static const struct usb_device_id products[] = { 
	 USB_DEVICE(0x0a46, 0x1269),	/* DM9621A USB to Fast Ethernet Adapter */

	 .driver_info = (unsigned long)&dm9601_info,

	},

	{

	 USB_DEVICE(0x0586, 0x3427),	/* ZyXEL Keenetic Plus DSL xDSL modem */

	 .driver_info = (unsigned long)&dm9601_info,

	},

	{},			// END

};

net/core/dev.c

+2 −1
Original line number Diff line number Diff line
@@ -6238,12 +6238,13 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi, 
		netdev_err_once(dev, "%s() called with weight %d\n", __func__,

				weight);

	napi->weight = weight;

	list_add(&napi->dev_list, &dev->napi_list);

	napi->dev = dev;

#ifdef CONFIG_NETPOLL

	napi->poll_owner = -1;

#endif

	set_bit(NAPI_STATE_SCHED, &napi->state);

	set_bit(NAPI_STATE_NPSVC, &napi->state);

	list_add_rcu(&napi->dev_list, &dev->napi_list);

	napi_hash_add(napi);

}

EXPORT_SYMBOL(netif_napi_add);

net/core/netpoll.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void poll_napi(struct net_device *dev) 
	struct napi_struct *napi;

	int cpu = smp_processor_id();



	list_for_each_entry(napi, &dev->napi_list, dev_list) {

	list_for_each_entry_rcu(napi, &dev->napi_list, dev_list) {

		if (cmpxchg(&napi->poll_owner, -1, cpu) == -1) {

			poll_one_napi(napi);

			smp_store_release(&napi->poll_owner, -1);

net/ipv4/fib_trie.c

+2 −1
Original line number Diff line number Diff line
@@ -2010,7 +2010,8 @@ void fib_info_notify_update(struct net *net, struct nl_info *info) 
		struct hlist_head *head = &net->ipv4.fib_table_hash[h];

		struct fib_table *tb;



		hlist_for_each_entry_rcu(tb, head, tb_hlist)

		hlist_for_each_entry_rcu(tb, head, tb_hlist,

					 lockdep_rtnl_is_held())

			__fib_info_notify_update(net, tb, info);

	}

}