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

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

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

Pull networking fixes from David Miller:

 1) Use after free in vlan, from Cong Wang.

 2) Handle NAPI poll with a zero budget properly in mlx5 driver, from
    Saeed Mahameed.

 3) If DMA mapping fails in mlx5 driver, NULL out page, from Inbar
    Karmy.

 4) Handle overrun in RX FIFO of sun4i CAN driver, from Gerhard
    Bertelsmann.

 5) Missing return in mdb and vlan prepare phase of DSA layer, from
    Vivien Didelot.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  vlan: fix a use-after-free in vlan_device_event()
  net: dsa: return after vlan prepare phase
  net: dsa: return after mdb prepare phase
  can: ifi: Fix transmitter delay calculation
  tcp: fix tcp_fastretrans_alert warning
  tcp: gso: avoid refcount_t warning from tcp_gso_segment()
  can: peak: Add support for new PCIe/M2 CAN FD interfaces
  can: sun4i: handle overrun in RX FIFO
  can: c_can: don't indicate triple sampling support for D_CAN
  net/mlx5e: Increase Striding RQ minimum size limit to 4 multi-packet WQEs
  net/mlx5e: Set page to null in case dma mapping fails
  net/mlx5e: Fix napi poll with zero budget
  net/mlx5: Cancel health poll before sending panic teardown command
  net/mlx5: Loop over temp list to release delay events
  rds: ib: Fix NULL pointer dereference in debug code
parents ca916599 92d28828

drivers/net/can/c_can/c_can_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_dev *pdev, 
		break;

	case BOSCH_D_CAN:

		priv->regs = reg_map_d_can;

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;

		break;

	default:

		ret = -EINVAL;

drivers/net/can/c_can/c_can_platform.c

+0 −1
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platform_device *pdev) 
		break;

	case BOSCH_D_CAN:

		priv->regs = reg_map_d_can;

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;

		priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;

		priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;

		priv->read_reg32 = d_can_plat_read_reg32;

drivers/net/can/ifi_canfd/ifi_canfd.c

+3 −3
Original line number Diff line number Diff line
@@ -670,9 +670,9 @@ static void ifi_canfd_set_bittiming(struct net_device *ndev) 
	       priv->base + IFI_CANFD_FTIME);



	/* Configure transmitter delay */

	tdc = (dbt->brp * (dbt->phase_seg1 + 1)) & IFI_CANFD_TDELAY_MASK;

	writel(IFI_CANFD_TDELAY_EN | IFI_CANFD_TDELAY_ABS | tdc,

	       priv->base + IFI_CANFD_TDELAY);

	tdc = dbt->brp * (dbt->prop_seg + dbt->phase_seg1);

	tdc &= IFI_CANFD_TDELAY_MASK;

	writel(IFI_CANFD_TDELAY_EN | tdc, priv->base + IFI_CANFD_TDELAY);

}



static void ifi_canfd_set_filter(struct net_device *ndev, const u32 id,

drivers/net/can/peak_canfd/peak_pciefd_main.c

+12 −2
Original line number Diff line number Diff line
@@ -29,14 +29,19 @@ 
#include "peak_canfd_user.h"



MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");

MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe FD family cards");

MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe FD CAN cards");

MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe/M.2 FD family cards");

MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe/M.2 FD CAN cards");

MODULE_LICENSE("GPL v2");



#define PCIEFD_DRV_NAME		"peak_pciefd"



#define PEAK_PCI_VENDOR_ID	0x001c	/* The PCI device and vendor IDs */

#define PEAK_PCIEFD_ID		0x0013	/* for PCIe slot cards */

#define PCAN_CPCIEFD_ID		0x0014	/* for Compact-PCI Serial slot cards */

#define PCAN_PCIE104FD_ID	0x0017	/* for PCIe-104 Express slot cards */

#define PCAN_MINIPCIEFD_ID      0x0018	/* for mini-PCIe slot cards */

#define PCAN_PCIEFD_OEM_ID      0x0019	/* for PCIe slot OEM cards */

#define PCAN_M2_ID		0x001a	/* for M2 slot cards */



/* PEAK PCIe board access description */

#define PCIEFD_BAR0_SIZE		(64 * 1024)
@@ -203,6 +208,11 @@ struct pciefd_board { 
/* supported device ids. */

static const struct pci_device_id peak_pciefd_tbl[] = {

	{PEAK_PCI_VENDOR_ID, PEAK_PCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},

	{PEAK_PCI_VENDOR_ID, PCAN_CPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},

	{PEAK_PCI_VENDOR_ID, PCAN_PCIE104FD_ID, PCI_ANY_ID, PCI_ANY_ID,},

	{PEAK_PCI_VENDOR_ID, PCAN_MINIPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},

	{PEAK_PCI_VENDOR_ID, PCAN_PCIEFD_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},

	{PEAK_PCI_VENDOR_ID, PCAN_M2_ID, PCI_ANY_ID, PCI_ANY_ID,},

	{0,}

};

drivers/net/can/sun4i_can.c

+10 −2
Original line number Diff line number Diff line
@@ -539,6 +539,13 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) 
		}

		stats->rx_over_errors++;

		stats->rx_errors++;



		/* reset the CAN IP by entering reset mode

		 * ignoring timeout error

		 */

		set_reset_mode(dev);

		set_normal_mode(dev);



		/* clear bit */

		sun4i_can_write_cmdreg(priv, SUN4I_CMD_CLEAR_OR_FLAG);

	}
@@ -653,8 +660,9 @@ static irqreturn_t sun4i_can_interrupt(int irq, void *dev_id) 
			netif_wake_queue(dev);

			can_led_event(dev, CAN_LED_EVENT_TX);

		}

		if (isrc & SUN4I_INT_RBUF_VLD) {

			/* receive interrupt */

		if ((isrc & SUN4I_INT_RBUF_VLD) &&

		    !(isrc & SUN4I_INT_DATA_OR)) {

			/* receive interrupt - don't read if overrun occurred */

			while (status & SUN4I_STA_RBUF_RDY) {

				/* RX buffer is not empty */

				sun4i_can_rx(dev);