Commit 30472908 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:
  [NIU]: Fix 1G PHY link state handling.
  [NET]: Fix TX timeout regression in Intel drivers.
parents abde3dff e415e6ea

drivers/net/e1000/e1000_main.c

+6 −3
Original line number Diff line number Diff line
@@ -3919,7 +3919,7 @@ e1000_clean(struct napi_struct *napi, int budget) 
{

	struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);

	struct net_device *poll_dev = adapter->netdev;

	int work_done = 0;

	int tx_cleaned = 0, work_done = 0;



	/* Must NOT use netdev_priv macro here. */

	adapter = poll_dev->priv;
@@ -3929,7 +3929,7 @@ e1000_clean(struct napi_struct *napi, int budget) 
	 * simultaneously.  A failure obtaining the lock means

	 * tx_ring[0] is currently being cleaned anyway. */

	if (spin_trylock(&adapter->tx_queue_lock)) {

		e1000_clean_tx_irq(adapter,

		tx_cleaned = e1000_clean_tx_irq(adapter,

						&adapter->tx_ring[0]);

		spin_unlock(&adapter->tx_queue_lock);

	}
@@ -3937,6 +3937,9 @@ e1000_clean(struct napi_struct *napi, int budget) 
	adapter->clean_rx(adapter, &adapter->rx_ring[0],

	                  &work_done, budget);



	if (tx_cleaned)

		work_done = budget;



	/* If budget not fully consumed, exit the polling mode */

	if (work_done < budget) {

		if (likely(adapter->itr_setting & 3))

drivers/net/e1000e/netdev.c

+5 −2
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ static int e1000_clean(struct napi_struct *napi, int budget) 
{

	struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);

	struct net_device *poll_dev = adapter->netdev;

	int work_done = 0;

	int tx_cleaned = 0, work_done = 0;



	/* Must NOT use netdev_priv macro here. */

	adapter = poll_dev->priv;
@@ -1394,12 +1394,15 @@ static int e1000_clean(struct napi_struct *napi, int budget) 
	 * simultaneously.  A failure obtaining the lock means

	 * tx_ring is currently being cleaned anyway. */

	if (spin_trylock(&adapter->tx_queue_lock)) {

		e1000_clean_tx_irq(adapter);

		tx_cleaned = e1000_clean_tx_irq(adapter);

		spin_unlock(&adapter->tx_queue_lock);

	}



	adapter->clean_rx(adapter, &work_done, budget);



	if (tx_cleaned)

		work_done = budget;



	/* If budget not fully consumed, exit the polling mode */

	if (work_done < budget) {

		if (adapter->itr_setting & 3)

drivers/net/ixgbe/ixgbe_main.c

+5 −2
Original line number Diff line number Diff line
@@ -1468,13 +1468,16 @@ static int ixgbe_clean(struct napi_struct *napi, int budget) 
	struct ixgbe_adapter *adapter = container_of(napi,

					struct ixgbe_adapter, napi);

	struct net_device *netdev = adapter->netdev;

	int work_done = 0;

	int tx_cleaned = 0, work_done = 0;



	/* In non-MSIX case, there is no multi-Tx/Rx queue */

	ixgbe_clean_tx_irq(adapter, adapter->tx_ring);

	tx_cleaned = ixgbe_clean_tx_irq(adapter, adapter->tx_ring);

	ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done,

			   budget);



	if (tx_cleaned)

		work_done = budget;



	/* If budget not fully consumed, exit the polling mode */

	if (work_done < budget) {

		netif_rx_complete(netdev, napi);

drivers/net/niu.c

+3 −0
Original line number Diff line number Diff line
@@ -1319,6 +1319,7 @@ static int link_status_10g(struct niu *np, int *link_up_p) 


static int link_status_1g(struct niu *np, int *link_up_p)

{

	struct niu_link_config *lp = &np->link_config;

	u16 current_speed, bmsr;

	unsigned long flags;

	u8 current_duplex;
@@ -1386,6 +1387,8 @@ static int link_status_1g(struct niu *np, int *link_up_p) 
				link_up = 0;

		}

	}

	lp->active_speed = current_speed;

	lp->active_duplex = current_duplex;

	err = 0;



out: