iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Linus Torvalds 2008-01-17 15:49:59 -08:00
commit 30472908d5
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/e1000/e1000_main.c
View File

@ -3919,7 +3919,7 @@ e1000_clean(struct napi_struct *napi, int budget)
{ {
struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi); struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
struct net_device *poll_dev = adapter->netdev; 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. */ /* Must NOT use netdev_priv macro here. */
adapter = poll_dev->priv; adapter = poll_dev->priv;
@ -3929,7 +3929,7 @@ e1000_clean(struct napi_struct *napi, int budget)
* simultaneously. A failure obtaining the lock means * simultaneously. A failure obtaining the lock means
* tx_ring[0] is currently being cleaned anyway. */ * tx_ring[0] is currently being cleaned anyway. */
if (spin_trylock(&adapter->tx_queue_lock)) { if (spin_trylock(&adapter->tx_queue_lock)) {
e1000_clean_tx_irq(adapter, tx_cleaned = e1000_clean_tx_irq(adapter,
&adapter->tx_ring[0]); &adapter->tx_ring[0]);
spin_unlock(&adapter->tx_queue_lock); 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], adapter->clean_rx(adapter, &adapter->rx_ring[0],
&work_done, budget); &work_done, budget);
if (tx_cleaned)
work_done = budget;
/* If budget not fully consumed, exit the polling mode */ /* If budget not fully consumed, exit the polling mode */
if (work_done < budget) { if (work_done < budget) {
if (likely(adapter->itr_setting & 3)) if (likely(adapter->itr_setting & 3))

7
drivers/net/e1000e/netdev.c
View File

@ -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 e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
struct net_device *poll_dev = adapter->netdev; 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. */ /* Must NOT use netdev_priv macro here. */
adapter = poll_dev->priv; 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 * simultaneously. A failure obtaining the lock means
* tx_ring is currently being cleaned anyway. */ * tx_ring is currently being cleaned anyway. */
if (spin_trylock(&adapter->tx_queue_lock)) { 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); spin_unlock(&adapter->tx_queue_lock);
} }
adapter->clean_rx(adapter, &work_done, budget); adapter->clean_rx(adapter, &work_done, budget);
if (tx_cleaned)
work_done = budget;
/* If budget not fully consumed, exit the polling mode */ /* If budget not fully consumed, exit the polling mode */
if (work_done < budget) { if (work_done < budget) {
if (adapter->itr_setting & 3) if (adapter->itr_setting & 3)

7
drivers/net/ixgbe/ixgbe_main.c
View File

@ -1468,13 +1468,16 @@ static int ixgbe_clean(struct napi_struct *napi, int budget)
struct ixgbe_adapter *adapter = container_of(napi, struct ixgbe_adapter *adapter = container_of(napi,
struct ixgbe_adapter, napi); struct ixgbe_adapter, napi);
struct net_device *netdev = adapter->netdev; 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 */ /* 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, ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done,
budget); budget);
if (tx_cleaned)
work_done = budget;
/* If budget not fully consumed, exit the polling mode */ /* If budget not fully consumed, exit the polling mode */
if (work_done < budget) { if (work_done < budget) {
netif_rx_complete(netdev, napi); netif_rx_complete(netdev, napi);

3
drivers/net/niu.c
View File

@ -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) static int link_status_1g(struct niu *np, int *link_up_p)
{ {
struct niu_link_config *lp = &np->link_config;
u16 current_speed, bmsr; u16 current_speed, bmsr;
unsigned long flags; unsigned long flags;
u8 current_duplex; u8 current_duplex;
@ -1386,6 +1387,8 @@ static int link_status_1g(struct niu *np, int *link_up_p)
link_up = 0; link_up = 0;
} }
} }
lp->active_speed = current_speed;
lp->active_duplex = current_duplex;
err = 0; err = 0;
out: out: