ia64/linux-2.6.18-xen.hg

diff drivers/net/sfc/txc43128_phy.c @ 847:ad4d307bf9ce

net sfc: Update sfc and sfc_resource driver to latest release

...and update sfc_netfront, sfc_netback, sfc_netutil for any API changes

sfc_netback: Fix asymmetric use of SFC buffer table alloc and free
sfc_netback: Clean up if no SFC accel device found
sfc_netback: Gracefully handle case where page grant fails
sfc_netback: Disable net acceleration if the physical link goes down
sfc_netfront: Less verbose error messages, more verbose counters for
rx discard errors
sfc_netfront: Gracefully handle case where SFC netfront fails during
initialisation

Signed-off-by: Kieran Mansley <kmansley@solarflare.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 31 11:59:10 2009 +0100 (2009-03-31)
parents 8c8a097cae69
children
line diff
     1.1 --- a/drivers/net/sfc/txc43128_phy.c	Tue Mar 31 11:49:12 2009 +0100
     1.2 +++ b/drivers/net/sfc/txc43128_phy.c	Tue Mar 31 11:59:10 2009 +0100
     1.3 @@ -653,10 +653,9 @@ static int txc43128_phy_check_hw(struct 
     1.4  	int link_up = txc43128_phy_read_link(efx);
     1.5  
     1.6  	/* Simulate a PHY event if link state has changed */
     1.7 -	if (link_up != efx->link_up) {
     1.8 -		efx->link_up = link_up;
     1.9 +	if (link_up != efx->link_up)
    1.10  		efx->mac_op->fake_phy_event(efx);
    1.11 -	} else if (EFX_WORKAROUND_10934(efx)) {
    1.12 +	else if (EFX_WORKAROUND_10934(efx)) {
    1.13  		if (link_up || (efx->loopback_mode != LOOPBACK_NONE))
    1.14  			data->bug10934_timer = jiffies;
    1.15  		else {