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

Commit 5d677670 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)
  be2net: set proper value to version field in req hdr
  xfrm: Fix xfrm_state_clone leak
  ipcomp: Avoid duplicate calls to ipcomp_destroy
  ethtool: allow non-admin user to read GRO settings.
  ixgbe: fix WOL register setup for 82599
  ixgbe: Fix - Do not allow Rx FC on 82598 at 1G due to errata
  sfc: Fix SFE4002 initialisation
  mac80211: fix handling of null-rate control in rate_control_get_rate
  inet: Remove bogus IGMPv3 report handling
  iwlwifi: fix AMSDU Rx after paged Rx patch
  tcp: fix ICMP-RTO war
  via-velocity: Fix races on shared interrupts
  via-velocity: Take spinlock on set coalesce
  via-velocity: Remove unused IRQ status parameter from rx_srv and tx_srv
  rtl8187: Add new device ID
  iwmc3200wifi: Test of wrong pointer after kzalloc in iwm_mlme_update_bss_table()
  ath9k: Fix sequence numbers for PAE frames
  mac80211: fix deferred hardware scan requests
  iwlwifi: Fix to set correct ht configuration
  mac80211: Fix probe request filtering in IBSS mode
  ...
parents 88626272 07793d33

drivers/net/benet/be_cmds.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -296,6 +296,7 @@ static void be_cmd_hdr_prepare(struct be_cmd_req_hdr *req_hdr, 
	req_hdr->opcode = opcode;

	req_hdr->opcode = opcode;

	req_hdr->subsystem = subsystem;

	req_hdr->subsystem = subsystem;

	req_hdr->request_length = cpu_to_le32(cmd_len - sizeof(*req_hdr));

	req_hdr->request_length = cpu_to_le32(cmd_len - sizeof(*req_hdr));

	req_hdr->version = 0;

}

}





static void be_cmd_page_addrs_prepare(struct phys_addr *pages, u32 max_pages,

static void be_cmd_page_addrs_prepare(struct phys_addr *pages, u32 max_pages,

drivers/net/ixgbe/ixgbe_82598.c

+22 −0
Original line number Original line Diff line number Diff line
@@ -357,12 +357,34 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num) 
	u32 fctrl_reg;

	u32 fctrl_reg;

	u32 rmcs_reg;

	u32 rmcs_reg;

	u32 reg;

	u32 reg;

	u32 link_speed = 0;

	bool link_up;





#ifdef CONFIG_DCB

#ifdef CONFIG_DCB

	if (hw->fc.requested_mode == ixgbe_fc_pfc)

	if (hw->fc.requested_mode == ixgbe_fc_pfc)

		goto out;

		goto out;





#endif /* CONFIG_DCB */

#endif /* CONFIG_DCB */

	/*

	 * On 82598 having Rx FC on causes resets while doing 1G

	 * so if it's on turn it off once we know link_speed. For

	 * more details see 82598 Specification update.

	 */

	hw->mac.ops.check_link(hw, &link_speed, &link_up, false);

	if (link_up && link_speed == IXGBE_LINK_SPEED_1GB_FULL) {

		switch (hw->fc.requested_mode) {

		case ixgbe_fc_full:

			hw->fc.requested_mode = ixgbe_fc_tx_pause;

			break;

		case ixgbe_fc_rx_pause:

			hw->fc.requested_mode = ixgbe_fc_none;

			break;

		default:

			/* no change */

			break;

		}

	}



	/* Negotiate the fc mode to use */

	/* Negotiate the fc mode to use */

	ret_val = ixgbe_fc_autoneg(hw);

	ret_val = ixgbe_fc_autoneg(hw);

	if (ret_val)

	if (ret_val)

drivers/net/ixgbe/ixgbe_main.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -5763,6 +5763,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	if (err)

	if (err)

		goto err_sw_init;

		goto err_sw_init;





	/* Make it possible the adapter to be woken up via WOL */

	if (adapter->hw.mac.type == ixgbe_mac_82599EB)

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);



	/*

	/*

	 * If there is a fan on this device and it has failed log the

	 * If there is a fan on this device and it has failed log the

	 * failure.

	 * failure.

drivers/net/sfc/efx.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2284,6 +2284,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, 
 fail2:

 fail2:

	efx_fini_struct(efx);

	efx_fini_struct(efx);

 fail1:

 fail1:

	WARN_ON(rc > 0);

	EFX_LOG(efx, "initialisation failed. rc=%d\n", rc);

	EFX_LOG(efx, "initialisation failed. rc=%d\n", rc);

	free_netdev(net_dev);

	free_netdev(net_dev);

	return rc;

	return rc;

drivers/net/sfc/qt202x_phy.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ static int qt202x_reset_phy(struct efx_nic *efx) 




	falcon_board(efx)->type->init_phy(efx);

	falcon_board(efx)->type->init_phy(efx);





	return rc;

	return 0;





 fail:

 fail:

	EFX_ERR(efx, "PHY reset timed out\n");

	EFX_ERR(efx, "PHY reset timed out\n");