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

Commit 59343cd7 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) Don't OOPS on socket AIO, from Christoph Hellwig.

 2) Scheduled scans should be aborted upon RFKILL, from Emmanuel
    Grumbach.

 3) Fix sleep in atomic context in kvaser_usb, from Ahmed S Darwish.

 4) Fix RCU locking across copy_to_user() in bpf code, from Alexei
    Starovoitov.

 5) Lots of crash, memory leak, short TX packet et al bug fixes in
    sh_eth from Ben Hutchings.

 6) Fix memory corruption in SCTP wrt.  INIT collitions, from Daniel
    Borkmann.

 7) Fix return value logic for poll handlers in netxen, enic, and bnx2x.
    From Eric Dumazet and Govindarajulu Varadarajan.

 8) Header length calculation fix in mac80211 from Fred Chou.

 9) mv643xx_eth doesn't handle highmem correctly in non-TSO code paths.
    From Ezequiel Garcia.

10) udp_diag has bogus logic in it's hash chain skipping, copy same fix
    tcp diag used.  From Herbert Xu.

11) amd-xgbe programs wrong rx flow control register, from Thomas
    Lendacky.

12) Fix race leading to use after free in ping receive path, from Subash
    Abhinov Kasiviswanathan.

13) Cache redirect routes otherwise we can get a heavy backlog of rcu
    jobs liberating DST_NOCACHE entries.  From Hannes Frederic Sowa.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (48 commits)
  net: don't OOPS on socket aio
  stmmac: prevent probe drivers to crash kernel
  bnx2x: fix napi poll return value for repoll
  ipv6: replacing a rt6_info needs to purge possible propagated rt6_infos too
  sh_eth: Fix DMA-API usage for RX buffers
  sh_eth: Check for DMA mapping errors on transmit
  sh_eth: Ensure DMA engines are stopped before freeing buffers
  sh_eth: Remove RX overflow log messages
  ping: Fix race in free in receive path
  udp_diag: Fix socket skipping within chain
  can: kvaser_usb: Fix state handling upon BUS_ERROR events
  can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT
  can: kvaser_usb: Send correct context to URB completion
  can: kvaser_usb: Do not sleep in atomic context
  ipv4: try to cache dst_entries which would cause a redirect
  samples: bpf: relax test_maps check
  bpf: rcu lock must not be held when calling copy_to_user()
  net: sctp: fix slab corruption from use after free on INIT collisions
  net: mv643xx_eth: Fix highmem support in non-TSO egress path
  sh_eth: Fix serialisation of interrupt disable with interrupt & NAPI handlers
  ...
parents 7da323bb 06539d30

arch/arm/boot/dts/imx6sx-sdb.dts

+4 −4
Original line number Diff line number Diff line
@@ -166,12 +166,12 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		ethphy1: ethernet-phy@0 {

			reg = <0>;

		ethphy1: ethernet-phy@1 {

			reg = <1>;

		};



		ethphy2: ethernet-phy@1 {

			reg = <1>;

		ethphy2: ethernet-phy@2 {

			reg = <2>;

		};

	};

};

drivers/net/can/c_can/c_can.c

+3 −0
Original line number Diff line number Diff line
@@ -615,6 +615,9 @@ static void c_can_stop(struct net_device *dev) 


	c_can_irq_control(priv, false);



	/* put ctrl to init on stop to end ongoing transmission */

	priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_INIT);



	/* deactivate pins */

	pinctrl_pm_select_sleep_state(dev->dev.parent);

	priv->can.state = CAN_STATE_STOPPED;

drivers/net/can/usb/kvaser_usb.c

+15 −13
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ static int kvaser_usb_simple_msg_async(struct kvaser_usb_net_priv *priv, 
			  usb_sndbulkpipe(dev->udev,

					  dev->bulk_out->bEndpointAddress),

			  buf, msg->len,

			  kvaser_usb_simple_msg_callback, priv);

			  kvaser_usb_simple_msg_callback, netdev);

	usb_anchor_urb(urb, &priv->tx_submitted);



	err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -662,11 +662,6 @@ static void kvaser_usb_rx_error(const struct kvaser_usb *dev, 
	priv = dev->nets[channel];

	stats = &priv->netdev->stats;



	if (status & M16C_STATE_BUS_RESET) {

		kvaser_usb_unlink_tx_urbs(priv);

		return;

	}



	skb = alloc_can_err_skb(priv->netdev, &cf);

	if (!skb) {

		stats->rx_dropped++;
@@ -677,7 +672,7 @@ static void kvaser_usb_rx_error(const struct kvaser_usb *dev, 


	netdev_dbg(priv->netdev, "Error status: 0x%02x\n", status);



	if (status & M16C_STATE_BUS_OFF) {

	if (status & (M16C_STATE_BUS_OFF | M16C_STATE_BUS_RESET)) {

		cf->can_id |= CAN_ERR_BUSOFF;



		priv->can.can_stats.bus_off++;
@@ -703,9 +698,7 @@ static void kvaser_usb_rx_error(const struct kvaser_usb *dev, 
		}



		new_state = CAN_STATE_ERROR_PASSIVE;

	}



	if (status == M16C_STATE_BUS_ERROR) {

	} else if (status & M16C_STATE_BUS_ERROR) {

		if ((priv->can.state < CAN_STATE_ERROR_WARNING) &&

		    ((txerr >= 96) || (rxerr >= 96))) {

			cf->can_id |= CAN_ERR_CRTL;
@@ -715,7 +708,8 @@ static void kvaser_usb_rx_error(const struct kvaser_usb *dev, 


			priv->can.can_stats.error_warning++;

			new_state = CAN_STATE_ERROR_WARNING;

		} else if (priv->can.state > CAN_STATE_ERROR_ACTIVE) {

		} else if ((priv->can.state > CAN_STATE_ERROR_ACTIVE) &&

			   ((txerr < 96) && (rxerr < 96))) {

			cf->can_id |= CAN_ERR_PROT;

			cf->data[2] = CAN_ERR_PROT_ACTIVE;
@@ -1590,7 +1584,7 @@ static int kvaser_usb_probe(struct usb_interface *intf, 
{

	struct kvaser_usb *dev;

	int err = -ENOMEM;

	int i;

	int i, retry = 3;



	dev = devm_kzalloc(&intf->dev, sizeof(*dev), GFP_KERNEL);

	if (!dev)
@@ -1608,7 +1602,15 @@ static int kvaser_usb_probe(struct usb_interface *intf, 


	usb_set_intfdata(intf, dev);



	/* On some x86 laptops, plugging a Kvaser device again after

	 * an unplug makes the firmware always ignore the very first

	 * command. For such a case, provide some room for retries

	 * instead of completely exiting the driver.

	 */

	do {

		err = kvaser_usb_get_software_info(dev);

	} while (--retry && err == -ETIMEDOUT);



	if (err) {

		dev_err(&intf->dev,

			"Cannot get software infos, error %d\n", err);

drivers/net/ethernet/amd/xgbe/xgbe-common.h

+5 −4
Original line number Diff line number Diff line
@@ -767,16 +767,17 @@ 
#define MTL_Q_RQOMR			0x40

#define MTL_Q_RQMPOCR			0x44

#define MTL_Q_RQDR			0x4c

#define MTL_Q_RQFCR			0x50

#define MTL_Q_IER			0x70

#define MTL_Q_ISR			0x74



/* MTL queue register entry bit positions and sizes */

#define MTL_Q_RQFCR_RFA_INDEX		1

#define MTL_Q_RQFCR_RFA_WIDTH		6

#define MTL_Q_RQFCR_RFD_INDEX		17

#define MTL_Q_RQFCR_RFD_WIDTH		6

#define MTL_Q_RQOMR_EHFC_INDEX		7

#define MTL_Q_RQOMR_EHFC_WIDTH		1

#define MTL_Q_RQOMR_RFA_INDEX		8

#define MTL_Q_RQOMR_RFA_WIDTH		3

#define MTL_Q_RQOMR_RFD_INDEX		13

#define MTL_Q_RQOMR_RFD_WIDTH		3

#define MTL_Q_RQOMR_RQS_INDEX		16

#define MTL_Q_RQOMR_RQS_WIDTH		9

#define MTL_Q_RQOMR_RSF_INDEX		5

drivers/net/ethernet/amd/xgbe/xgbe-dev.c

+2 −2
Original line number Diff line number Diff line
@@ -2079,10 +2079,10 @@ static void xgbe_config_flow_control_threshold(struct xgbe_prv_data *pdata) 


	for (i = 0; i < pdata->rx_q_count; i++) {

		/* Activate flow control when less than 4k left in fifo */

		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, RFA, 2);

		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQFCR, RFA, 2);



		/* De-activate flow control when more than 6k left in fifo */

		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, RFD, 4);

		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQFCR, RFD, 4);

	}

}