Commit 433ab34d 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:
 "Here are some bug fixes that have piled up during ksummit/linuxcon.

   1) Fix endian problems in ibmveth, from Anton Blanchard.

   2) IPV6 routing code does GFP_KERNEL allocation in atomic, fix from
      Benjamin Block.

   3) SCTP association fixes from Daniel Borkmann.

   4) When multiple VLAN headers are present we have to make sure the
      second and subsequent ones are pullable in the SKB otherwise we
      blindly dereference garbage.  From Jiri Benc.

   5) The argument adjustment of the signature of hlist_add_after*()
      introduced a regression in the batman-adv code, fix from Sven
      Eckelmann.

   6) Fix TX hang handling to avoid a panic in i40e, from Anjali Singhai
      Jain.

   7) PTP flag test is inverted in i40e driver, from Jesse Brandeburg.

   8) ATM LEC driver needs to hold RTNL mutex over MTU changes, from
      Chas Williams.

   9) Truncate packets larger then the TPACKET_V3 format configured
      buffers, otherwise we overwrite past the end of said buffers.
      From Eric Dumazet.

  10) Fix endianness bugs in qlcnic firmware handling, from Rajesh
      Borundia and Shahed Shaikh.

  11) CXGB4 sometimes doesn't get all of the TX completion events it
      should resulting in SKBs getting stuck in the TX queue, from
      Hariprasad Shenai.

  12) When the FEC chip's PTP clock is disabled, you can't access the
      register.  Add necessary checks to avoid the resulting hang, from
      Fugang Duan"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
  drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndef
  net: sctp: fix suboptimal edge-case on non-active active/retrans path selection
  net: sctp: spare unnecessary comparison in sctp_trans_elect_best
  net: ethernet: broadcom: bnx2x: Remove redundant #ifdef
  ibmveth: Fix endian issues with rx_no_buffer statistic
  net: xgene: fix possible NULL dereference in xgene_enet_free_desc_rings()
  openvswitch: fix panic with multiple vlan headers
  net: ipv6: fib: don't sleep inside atomic lock
  net: fec: ptp: avoid register access when ipg clock is disabled
  cxgb4: Free completed tx skbs promptly
  cxgb4: Fix race condition in cleanup
  sctp: not send SCTP_PEER_ADDR_CHANGE notifications with failed probe
  bnx2x: Revert UNDI flushing mechanism
  qlcnic: Fix endianess issue in firmware load from file operation
  qlcnic: Fix endianess issue in FW dump template header
  qlcnic: Fix flash access interface to application
  MAINTAINERS: Add section for MRF24J40 IEEE 802.15.4 radio driver
  macvlan: Allow setting multicast filter on all macvlan types
  packet: handle too big packets for PACKET_V3
  MAINTAINERS: add entry for ec_bhf driver
  ...
parents 26d189b8 faaa5524

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -1843,6 +1843,12 @@ S: Orphan 
F:	Documentation/filesystems/befs.txt

F:	fs/befs/



BECKHOFF CX5020 ETHERCAT MASTER DRIVER

M: Dariusz Marcinkiewicz <reksio@newterm.pl>

L: netdev@vger.kernel.org

S: Maintained

F: drivers/net/ethernet/ec_bhf.c



BFS FILE SYSTEM

M:	"Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>

S:	Maintained
@@ -5982,6 +5988,12 @@ T: git git://linuxtv.org/media_tree.git 
S:	Maintained

F:	drivers/media/radio/radio-mr800.c



MRF24J40 IEEE 802.15.4 RADIO DRIVER

M:	Alan Ott <alan@signal11.us>

L:	linux-wpan@vger.kernel.org

S:	Maintained

F:	drivers/net/ieee802154/mrf24j40.c



MSI LAPTOP SUPPORT

M:	"Lee, Chun-Yi" <jlee@suse.com>

L:	platform-driver-x86@vger.kernel.org

drivers/isdn/hardware/eicon/xdi_msg.h

+1 −1
Original line number Diff line number Diff line 
/* $Id: xdi_msg.h,v 1.1.2.2 2001/02/16 08:40:36 armin Exp $ */



#ifndef __DIVA_XDI_UM_CFG_MESSSGE_H__

#ifndef __DIVA_XDI_UM_CFG_MESSAGE_H__

#define __DIVA_XDI_UM_CFG_MESSAGE_H__



/*

drivers/net/can/c_can/c_can_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int c_can_plat_probe(struct platform_device *pdev) 


		priv->raminit_ctrlreg = devm_ioremap(&pdev->dev, res->start,

						     resource_size(res));

		if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)

		if (!priv->raminit_ctrlreg || priv->instance < 0)

			dev_info(&pdev->dev, "control memory is not used for raminit\n");

		else

			priv->raminit = c_can_hw_raminit_ti;

drivers/net/can/flexcan.c

+9 −0
Original line number Diff line number Diff line
@@ -549,6 +549,13 @@ static void do_state(struct net_device *dev, 


	/* process state changes depending on the new state */

	switch (new_state) {

	case CAN_STATE_ERROR_WARNING:

		netdev_dbg(dev, "Error Warning\n");

		cf->can_id |= CAN_ERR_CRTL;

		cf->data[1] = (bec.txerr > bec.rxerr) ?

			CAN_ERR_CRTL_TX_WARNING :

			CAN_ERR_CRTL_RX_WARNING;

		break;

	case CAN_STATE_ERROR_ACTIVE:

		netdev_dbg(dev, "Error Active\n");

		cf->can_id |= CAN_ERR_PROT;
@@ -852,6 +859,8 @@ static int flexcan_chip_start(struct net_device *dev) 
	if (priv->devtype_data->features & FLEXCAN_HAS_BROKEN_ERR_STATE ||

	    priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)

		reg_ctrl |= FLEXCAN_CTRL_ERR_MSK;

	else

		reg_ctrl &= ~FLEXCAN_CTRL_ERR_MSK;



	/* save for later use */

	priv->reg_ctrl_default = reg_ctrl;

drivers/net/can/sja1000/sja1000.c

+33 −29
Original line number Diff line number Diff line
@@ -172,6 +172,35 @@ static void set_normal_mode(struct net_device *dev) 
	netdev_err(dev, "setting SJA1000 into normal mode failed!\n");

}



/*

 * initialize SJA1000 chip:

 *   - reset chip

 *   - set output mode

 *   - set baudrate

 *   - enable interrupts

 *   - start operating mode

 */

static void chipset_init(struct net_device *dev)

{

	struct sja1000_priv *priv = netdev_priv(dev);



	/* set clock divider and output control register */

	priv->write_reg(priv, SJA1000_CDR, priv->cdr | CDR_PELICAN);



	/* set acceptance filter (accept all) */

	priv->write_reg(priv, SJA1000_ACCC0, 0x00);

	priv->write_reg(priv, SJA1000_ACCC1, 0x00);

	priv->write_reg(priv, SJA1000_ACCC2, 0x00);

	priv->write_reg(priv, SJA1000_ACCC3, 0x00);



	priv->write_reg(priv, SJA1000_ACCM0, 0xFF);

	priv->write_reg(priv, SJA1000_ACCM1, 0xFF);

	priv->write_reg(priv, SJA1000_ACCM2, 0xFF);

	priv->write_reg(priv, SJA1000_ACCM3, 0xFF);



	priv->write_reg(priv, SJA1000_OCR, priv->ocr | OCR_MODE_NORMAL);

}



static void sja1000_start(struct net_device *dev)

{

	struct sja1000_priv *priv = netdev_priv(dev);
@@ -180,6 +209,10 @@ static void sja1000_start(struct net_device *dev) 
	if (priv->can.state != CAN_STATE_STOPPED)

		set_reset_mode(dev);



	/* Initialize chip if uninitialized at this stage */

	if (!(priv->read_reg(priv, SJA1000_CDR) & CDR_PELICAN))

		chipset_init(dev);



	/* Clear error counters and error code capture */

	priv->write_reg(priv, SJA1000_TXERR, 0x0);

	priv->write_reg(priv, SJA1000_RXERR, 0x0);
@@ -236,35 +269,6 @@ static int sja1000_get_berr_counter(const struct net_device *dev, 
	return 0;

}



/*

 * initialize SJA1000 chip:

 *   - reset chip

 *   - set output mode

 *   - set baudrate

 *   - enable interrupts

 *   - start operating mode

 */

static void chipset_init(struct net_device *dev)

{

	struct sja1000_priv *priv = netdev_priv(dev);



	/* set clock divider and output control register */

	priv->write_reg(priv, SJA1000_CDR, priv->cdr | CDR_PELICAN);



	/* set acceptance filter (accept all) */

	priv->write_reg(priv, SJA1000_ACCC0, 0x00);

	priv->write_reg(priv, SJA1000_ACCC1, 0x00);

	priv->write_reg(priv, SJA1000_ACCC2, 0x00);

	priv->write_reg(priv, SJA1000_ACCC3, 0x00);



	priv->write_reg(priv, SJA1000_ACCM0, 0xFF);

	priv->write_reg(priv, SJA1000_ACCM1, 0xFF);

	priv->write_reg(priv, SJA1000_ACCM2, 0xFF);

	priv->write_reg(priv, SJA1000_ACCM3, 0xFF);



	priv->write_reg(priv, SJA1000_OCR, priv->ocr | OCR_MODE_NORMAL);

}



/*

 * transmit a CAN message

 * message layout in the sk_buff should be like this:

CRA Git | Maintained and supported by SUSTech CRA and CCSE