Commit 186d32bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bluetooth, and ipsec.

  Current release - regressions:

   - Bluetooth: fix unbalanced unlock in set_device_flags()

   - Bluetooth: fix not processing all entries on cmd_sync_work, make
     connect with qualcomm and intel adapters reliable

   - Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"

   - xdp: xdp_mem_allocator can be NULL in trace_mem_connect()

   - eth: ice: fix race condition and deadlock during interface enslave

  Current release - new code bugs:

   - tipc: fix incorrect order of state message data sanity check

  Previous releases - regressions:

   - esp: fix possible buffer overflow in ESP transformation

   - dsa: unlock the rtnl_mutex when dsa_master_setup() fails

   - phy: meson-gxl: fix interrupt handling in forced mode

   - smsc95xx: ignore -ENODEV errors when device is unplugged

  Previous releases - always broken:

   - xfrm: fix tunnel mode fragmentation behavior

   - esp: fix inter address family tunneling on GSO

   - tipc: fix null-deref due to race when enabling bearer

   - sctp: fix kernel-infoleak for SCTP sockets

   - eth: macb: fix lost RX packet wakeup race in NAPI receive

   - eth: intel stop disabling VFs due to PF error responses

   - eth: bcmgenet: don't claim WOL when its not available"

* tag 'net-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (50 commits)
  xdp: xdp_mem_allocator can be NULL in trace_mem_connect().
  ice: Fix race condition during interface enslave
  net: phy: meson-gxl: improve link-up behavior
  net: bcmgenet: Don't claim WOL when its not available
  net: arc_emac: Fix use after free in arc_mdio_probe()
  sctp: fix kernel-infoleak for SCTP sockets
  net: phy: correct spelling error of media in documentation
  net: phy: DP83822: clear MISR2 register to disable interrupts
  gianfar: ethtool: Fix refcount leak in gfar_get_ts_info
  selftests: pmtu.sh: Kill nettest processes launched in subshell.
  selftests: pmtu.sh: Kill tcpdump processes launched by subshell.
  NFC: port100: fix use-after-free in port100_send_complete
  net/mlx5e: SHAMPO, reduce TIR indication
  net/mlx5e: Lag, Only handle events from highest priority multipath entry
  net/mlx5: Fix offloading with ESWITCH_IPV4_TTL_MODIFY_ENABLE
  net/mlx5: Fix a race on command flush flow
  net/mlx5: Fix size field in bufferx_reg struct
  ax25: Fix NULL pointer dereference in ax25_kill_by_device
  net: marvell: prestera: Add missing of_node_put() in prestera_switch_set_base_mac_addr
  net: ethernet: lpc_eth: Handle error for clk_enable
  ...
parents 3bcb6451 e0ae7130

drivers/isdn/hardware/mISDN/hfcpci.c

+5 −1
Original line number Diff line number Diff line
@@ -2005,7 +2005,11 @@ setup_hw(struct hfc_pci *hc) 
	}

	/* Allocate memory for FIFOS */

	/* the memory needs to be on a 32k boundary within the first 4G */

	dma_set_mask(&hc->pdev->dev, 0xFFFF8000);

	if (dma_set_mask(&hc->pdev->dev, 0xFFFF8000)) {

		printk(KERN_WARNING

		       "HFC-PCI: No usable DMA configuration!\n");

		return -EIO;

	}

	buffer = dma_alloc_coherent(&hc->pdev->dev, 0x8000, &hc->hw.dmahandle,

				    GFP_KERNEL);

	/* We silently assume the address is okay if nonzero */

drivers/isdn/mISDN/dsp_pipeline.c

+3 −3
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ void dsp_pipeline_destroy(struct dsp_pipeline *pipeline) 
int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)

{

	int found = 0;

	char *dup, *tok, *name, *args;

	char *dup, *next, *tok, *name, *args;

	struct dsp_element_entry *entry, *n;

	struct dsp_pipeline_entry *pipeline_entry;

	struct mISDN_dsp_element *elem;
@@ -203,10 +203,10 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg) 
	if (!list_empty(&pipeline->list))

		_dsp_pipeline_destroy(pipeline);



	dup = kstrdup(cfg, GFP_ATOMIC);

	dup = next = kstrdup(cfg, GFP_ATOMIC);

	if (!dup)

		return 0;

	while ((tok = strsep(&dup, "|"))) {

	while ((tok = strsep(&next, "|"))) {

		if (!strlen(tok))

			continue;

		name = strsep(&tok, "(");

drivers/net/dsa/mt7530.c

+1 −1
Original line number Diff line number Diff line
@@ -2936,7 +2936,7 @@ mt753x_phylink_validate(struct dsa_switch *ds, int port, 


	phylink_set_port_modes(mask);



	if (state->interface != PHY_INTERFACE_MODE_TRGMII ||

	if (state->interface != PHY_INTERFACE_MODE_TRGMII &&

	    !phy_interface_mode_is_8023z(state->interface)) {

		phylink_set(mask, 10baseT_Half);

		phylink_set(mask, 10baseT_Full);

drivers/net/ethernet/8390/mcf8390.c

+5 −5
Original line number Diff line number Diff line
@@ -405,12 +405,12 @@ static int mcf8390_init(struct net_device *dev) 
static int mcf8390_probe(struct platform_device *pdev)

{

	struct net_device *dev;

	struct resource *mem, *irq;

	struct resource *mem;

	resource_size_t msize;

	int ret;

	int ret, irq;



	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (irq == NULL) {

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "no IRQ specified?\n");

		return -ENXIO;

	}
@@ -433,7 +433,7 @@ static int mcf8390_probe(struct platform_device *pdev) 
	SET_NETDEV_DEV(dev, &pdev->dev);

	platform_set_drvdata(pdev, dev);



	dev->irq = irq->start;

	dev->irq = irq;

	dev->base_addr = mem->start;



	ret = mcf8390_init(dev);

drivers/net/ethernet/arc/emac_mdio.c

+3 −2
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ int arc_mdio_probe(struct arc_emac_priv *priv) 
{

	struct arc_emac_mdio_bus_data *data = &priv->bus_data;

	struct device_node *np = priv->dev->of_node;

	const char *name = "Synopsys MII Bus";

	struct mii_bus *bus;

	int error;
@@ -142,7 +143,7 @@ int arc_mdio_probe(struct arc_emac_priv *priv) 
	priv->bus = bus;

	bus->priv = priv;

	bus->parent = priv->dev;

	bus->name = "Synopsys MII Bus";

	bus->name = name;

	bus->read = &arc_mdio_read;

	bus->write = &arc_mdio_write;

	bus->reset = &arc_mdio_reset;
@@ -167,7 +168,7 @@ int arc_mdio_probe(struct arc_emac_priv *priv) 
	if (error) {

		mdiobus_free(bus);

		return dev_err_probe(priv->dev, error,

				     "cannot register MDIO bus %s\n", bus->name);

				     "cannot register MDIO bus %s\n", name);

	}



	return 0;