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

Commit 1e30c1b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking updates and fixes from David Miller:

1) Reinstate the no-ref optimization for input route lookups in ipv4 to
   fix some routing cache removal perf regressions.

2) Make TCP socket pre-demux work on ipv6 side too, from Eric Dumazet.

3) Get RX hash value from correct place in be2net driver, from
   Sarveshwar Bandi.

4) Validation of FIB cached routes missing critical check, from Eric
   Dumazet.

5) EEH support in mlx4 driver, from Kleber Sacilotto de Souza.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (23 commits)
  ipv6: Early TCP socket demux
  ipv4: Fix input route performance regression.
  pch_gbe: vlan skb len fix
  pch_gbe: add extra clean tx
  pch_gbe: fix transmit watchdog timeout
  ixgbe: fix panic while dumping packets on Tx hang with IOMMU
  be2net: Fix to parse RSS hash from Receive completions correctly.
  net/mlx4_en: Limit the RFS filter IDs to be < RPS_NO_FILTER
  hyperv: Add error handling to rndis_filter_device_add()
  hyperv: Add a check for ring_size value
  ipv4: rt_cache_valid must check expired routes
  net/pch_gpe: Cannot disable ethernet autonegation
  qeth: repair crash in qeth_l3_vlan_rx_kill_vid()
  netiucv: cleanup attribute usage
  net: wiznet add missing HAS_IOMEM dependency
  be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC
  mlx4: Add support for EEH error recovery
  cdc-ncm: tag Ericsson WWAN devices (eg F5521gw) with FLAG_WWAN
  wanmain: comparing array with NULL
  caif: fix NULL pointer check
  ...
parents a1857ebe c7109986

drivers/net/caif/caif_serial.c

+3 −0
Original line number Diff line number Diff line
@@ -325,6 +325,9 @@ static int ldisc_open(struct tty_struct *tty) 


	sprintf(name, "cf%s", tty->name);

	dev = alloc_netdev(sizeof(*ser), name, caifdev_setup);

	if (!dev)

		return -ENOMEM;



	ser = netdev_priv(dev);

	ser->tty = tty_kref_get(tty);

	ser->dev = dev;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h

+4 −0
Original line number Diff line number Diff line
@@ -1603,6 +1603,10 @@ 
 * of counts that the SM entered the EEE LPI state. Clock 25MHz. Read only

 * register. Reset on hard reset. */

#define MISC_REG_CPMU_LP_SM_ENT_CNT_P0				 0xa8b8

/* [RW 16] EEE LPI Entry Events Counter. A statistic counter with the number

 * of counts that the SM entered the EEE LPI state. Clock 25MHz. Read only

 * register. Reset on hard reset. */

#define MISC_REG_CPMU_LP_SM_ENT_CNT_P1				 0xa8bc

/* [RW 32] The following driver registers(1...16) represent 16 drivers and

   32 clients. Each client can be controlled by one driver only. One in each

   bit represent that this driver control the appropriate client (Ex: bit 5

drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

+5 −3
Original line number Diff line number Diff line
@@ -785,9 +785,11 @@ static int bnx2x_hw_stats_update(struct bnx2x *bp) 


	pstats->host_port_stats_counter++;



	if (CHIP_IS_E3(bp))

		estats->eee_tx_lpi += REG_RD(bp,

					     MISC_REG_CPMU_LP_SM_ENT_CNT_P0);

	if (CHIP_IS_E3(bp)) {

		u32 lpi_reg = BP_PORT(bp) ? MISC_REG_CPMU_LP_SM_ENT_CNT_P1

					  : MISC_REG_CPMU_LP_SM_ENT_CNT_P0;

		estats->eee_tx_lpi += REG_RD(bp, lpi_reg);

	}



	if (!BP_NOMCP(bp)) {

		u32 nig_timer_max =

drivers/net/ethernet/emulex/benet/be_ethtool.c

+3 −2
Original line number Diff line number Diff line
@@ -910,8 +910,9 @@ static void be_set_fw_log_level(struct be_adapter *adapter, u32 level) 
	if (!status) {

		cfgs = (struct be_fat_conf_params *)(extfat_cmd.va +

					sizeof(struct be_cmd_resp_hdr));

		for (i = 0; i < cfgs->num_modules; i++) {

			for (j = 0; j < cfgs->module[i].num_modes; j++) {

		for (i = 0; i < le32_to_cpu(cfgs->num_modules); i++) {

			u32 num_modes = le32_to_cpu(cfgs->module[i].num_modes);

			for (j = 0; j < num_modes; j++) {

				if (cfgs->module[i].trace_lvl[j].mode ==

								MODE_UART)

					cfgs->module[i].trace_lvl[j].dbg_lvl =

drivers/net/ethernet/emulex/benet/be_main.c

+3 −3
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ static void be_parse_rx_compl_v1(struct be_eth_rx_compl *compl, 
	rxcp->pkt_type =

		AMAP_GET_BITS(struct amap_eth_rx_compl_v1, cast_enc, compl);

	rxcp->rss_hash =

		AMAP_GET_BITS(struct amap_eth_rx_compl_v1, rsshash, rxcp);

		AMAP_GET_BITS(struct amap_eth_rx_compl_v1, rsshash, compl);

	if (rxcp->vlanf) {

		rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm,

					  compl);
@@ -1429,7 +1429,7 @@ static void be_parse_rx_compl_v0(struct be_eth_rx_compl *compl, 
	rxcp->pkt_type =

		AMAP_GET_BITS(struct amap_eth_rx_compl_v0, cast_enc, compl);

	rxcp->rss_hash =

		AMAP_GET_BITS(struct amap_eth_rx_compl_v0, rsshash, rxcp);

		AMAP_GET_BITS(struct amap_eth_rx_compl_v0, rsshash, compl);

	if (rxcp->vlanf) {

		rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm,

					  compl);
@@ -3579,7 +3579,7 @@ u32 be_get_fw_log_level(struct be_adapter *adapter) 
	if (!status) {

		cfgs = (struct be_fat_conf_params *)(extfat_cmd.va +

						sizeof(struct be_cmd_resp_hdr));

		for (j = 0; j < cfgs->module[0].num_modes; j++) {

		for (j = 0; j < le32_to_cpu(cfgs->module[0].num_modes); j++) {

			if (cfgs->module[0].trace_lvl[j].mode == MODE_UART)

				level = cfgs->module[0].trace_lvl[j].dbg_lvl;

		}