sfc: 10Xpress: Initialise pause advertising flags
authorBen Hutchings <bhutchings@solarflare.com>
Mon, 12 Oct 2009 09:27:07 +0000 (09:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 06:59:09 +0000 (23:59 -0700)
The mdio module now handles reconfiguration of pause advertising
through ethtool, but not initialisation.  Add the necessary
initialisation to tenxpress_phy_init().

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/sfc/tenxpress.c

index f4d5090..1a3495c 100644 (file)
@@ -301,6 +301,7 @@ static int tenxpress_init(struct efx_nic *efx)
 static int tenxpress_phy_init(struct efx_nic *efx)
 {
        struct tenxpress_phy_data *phy_data;
 static int tenxpress_phy_init(struct efx_nic *efx)
 {
        struct tenxpress_phy_data *phy_data;
+       u16 old_adv, adv;
        int rc = 0;
 
        phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL);
        int rc = 0;
 
        phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL);
@@ -333,6 +334,15 @@ static int tenxpress_phy_init(struct efx_nic *efx)
        if (rc < 0)
                goto fail;
 
        if (rc < 0)
                goto fail;
 
+       /* Set pause advertising */
+       old_adv = efx_mdio_read(efx, MDIO_MMD_AN, MDIO_AN_ADVERTISE);
+       adv = ((old_adv & ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) |
+              mii_advertise_flowctrl(efx->wanted_fc));
+       if (adv != old_adv) {
+               efx_mdio_write(efx, MDIO_MMD_AN, MDIO_AN_ADVERTISE, adv);
+               mdio45_nway_restart(&efx->mdio);
+       }
+
        if (efx->phy_type == PHY_TYPE_SFT9001B) {
                rc = device_create_file(&efx->pci_dev->dev,
                                        &dev_attr_phy_short_reach);
        if (efx->phy_type == PHY_TYPE_SFT9001B) {
                rc = device_create_file(&efx->pci_dev->dev,
                                        &dev_attr_phy_short_reach);