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

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

Merge 4.19.145 into android-4.19-stable 



Changes in 4.19.145
	ALSA; firewire-tascam: exclude Tascam FE-8 from detection
	block: ensure bdi->io_pages is always initialized
	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()
	tipc: fix shutdown() of connectionless socket
	net: disable netpoll on fresh napis
	net/mlx5e: Don't support phys switch id if not in switchdev mode
	Linux 4.19.145

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I84b193f4c87a87efbba84219856368d3cfba907b
parents 3b165ab6 a87f9628

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 144

SUBLEVEL = 145

EXTRAVERSION =

NAME = "People's Front"

block/blk-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,8 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id, 


	q->backing_dev_info->ra_pages =

			(VM_MAX_READAHEAD * 1024) / PAGE_SIZE;

	q->backing_dev_info->io_pages =

			(VM_MAX_READAHEAD * 1024) / PAGE_SIZE;

	q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK;

	q->backing_dev_info->name = "block";

	q->node = node_id;

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int mlx5e_attr_get(struct net_device *dev, struct switchdev_attr *attr) 
	struct mlx5_eswitch_rep *rep = rpriv->rep;

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;



	if (esw->mode == SRIOV_NONE)

	if (esw->mode != SRIOV_OFFLOADS)

		return -EOPNOTSUPP;



	switch (attr->id) {

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
@@ -6202,12 +6202,13 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi, 
		pr_err_once("netif_napi_add() called with weight %d on device %s\n",

			    weight, dev->name);

	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);