Commit 1840897a 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: (34 commits)
  b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd
  mac80211: fix failure to check kmalloc return value in key_key_read
  libertas: Fix sd8686 firmware reload
  ath9k: Fix incorrect access of rate flags in RC
  netfilter: xt_socket: Make tproto signed in socket_mt6_v1().
  stmmac: enable/disable rx/tx in the core with a single write.
  net: atarilance - flags should be unsigned long
  netxen: fix kdump
  pktgen: Limit how much data we copy onto the stack.
  net: Limit socket I/O iovec total length to INT_MAX.
  USB: gadget: fix ethernet gadget crash in gether_setup
  fib: Fix fib zone and its hash leak on namespace stop
  cxgb3: Fix panic in free_tx_desc()
  cxgb3: fix crash due to manipulating queues before registration
  8390: Don't oops on starting dev queue
  dccp ccid-2: Stop polling
  dccp: Refine the wait-for-ccid mechanism
  dccp: Extend CCID packet dequeueing interface
  dccp: Return-value convention of hc_tx_send_packet()
  igbvf: fix panic on load
  ...
parents d56f84e7 a4765fa7

drivers/net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2541,6 +2541,7 @@ source "drivers/net/stmmac/Kconfig" 
config PCH_GBE

	tristate "PCH Gigabit Ethernet"

	depends on PCI

	select MII

	---help---

	  This is a gigabit ethernet driver for Topcliff PCH.

	  Topcliff PCH is the platform controller hub that is used in Intel's

drivers/net/atarilance.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static noinline int __init addr_accessible(volatile void *regp, int wordflag, 
					   int writeflag)

{

	int		ret;

	long	flags;

	unsigned long	flags;

	long	*vbr, save_berr;



	local_irq_save(flags);

drivers/net/cxgb3/cxgb3_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3301,7 +3301,6 @@ static int __devinit init_one(struct pci_dev *pdev, 
		pi->rx_offload = T3_RX_CSUM | T3_LRO;

		pi->port_id = i;

		netif_carrier_off(netdev);

		netif_tx_stop_all_queues(netdev);

		netdev->irq = pdev->irq;

		netdev->mem_start = mmio_start;

		netdev->mem_end = mmio_start + mmio_len - 1;
@@ -3342,6 +3341,7 @@ static int __devinit init_one(struct pci_dev *pdev, 
				adapter->name = adapter->port[i]->name;



			__set_bit(i, &adapter->registered_device_map);

			netif_tx_stop_all_queues(adapter->port[i]);

		}

	}

	if (!adapter->registered_device_map) {

drivers/net/cxgb3/sge.c

+3 −1
Original line number Diff line number Diff line
@@ -296,8 +296,10 @@ static void free_tx_desc(struct adapter *adapter, struct sge_txq *q, 
		if (d->skb) {	/* an SGL is present */

			if (need_unmap)

				unmap_skb(d->skb, q, cidx, pdev);

			if (d->eop)

			if (d->eop) {

				kfree_skb(d->skb);

				d->skb = NULL;

			}

		}

		++d;

		if (++cidx == q->size) {

drivers/net/e1000e/82571.c

+38 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ 
			      (ID_LED_DEF1_DEF2))



#define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000

#define E1000_BASE1000T_STATUS          10

#define E1000_IDLE_ERROR_COUNT_MASK     0xFF

#define E1000_RECEIVE_ERROR_COUNTER     21

#define E1000_RECEIVE_ERROR_MAX         0xFFFF



#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */
@@ -1242,6 +1246,39 @@ static s32 e1000_led_on_82574(struct e1000_hw *hw) 
	return 0;

}



/**

 *  e1000_check_phy_82574 - check 82574 phy hung state

 *  @hw: pointer to the HW structure

 *

 *  Returns whether phy is hung or not

 **/

bool e1000_check_phy_82574(struct e1000_hw *hw)

{

	u16 status_1kbt = 0;

	u16 receive_errors = 0;

	bool phy_hung = false;

	s32 ret_val = 0;



	/*

	 * Read PHY Receive Error counter first, if its is max - all F's then

	 * read the Base1000T status register If both are max then PHY is hung.

	 */

	ret_val = e1e_rphy(hw, E1000_RECEIVE_ERROR_COUNTER, &receive_errors);



	if (ret_val)

		goto out;

	if (receive_errors == E1000_RECEIVE_ERROR_MAX)  {

		ret_val = e1e_rphy(hw, E1000_BASE1000T_STATUS, &status_1kbt);

		if (ret_val)

			goto out;

		if ((status_1kbt & E1000_IDLE_ERROR_COUNT_MASK) ==

		    E1000_IDLE_ERROR_COUNT_MASK)

			phy_hung = true;

	}

out:

	return phy_hung;

}



/**

 *  e1000_setup_link_82571 - Setup flow control and link settings

 *  @hw: pointer to the HW structure
@@ -1859,6 +1896,7 @@ struct e1000_info e1000_82574_info = { 
				  | FLAG_HAS_SMART_POWER_DOWN

				  | FLAG_HAS_AMT

				  | FLAG_HAS_CTRLEXT_ON_LOAD,

	.flags2			  = FLAG2_CHECK_PHY_HANG,

	.pba			= 36,

	.max_hw_frame_size	= DEFAULT_JUMBO,

	.get_variants		= e1000_get_variants_82571,

CRA Git | Maintained and supported by SUSTech CRA and CCSE