]> Pileus Git - ~andy/linux/commitdiff
tg3: Add a warning during link settings change if mgmt enabled
authorNithin Sujir <nsujir@broadcom.com>
Tue, 9 Apr 2013 08:48:04 +0000 (08:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Apr 2013 19:14:14 +0000 (15:14 -0400)
When the user executes certain ethtool commands such as -s, -A, -G, -L,
-r a phy reset or autonegotiate is performed which results in management
traffic being interrupted.

Add a warning in these cases.

Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/tg3.c

index 3f0d43f912ec8f2a5a3078921624c0a1b1f2aec9..a7449984c7a68f01666d101e49b42a53105abd07 100644 (file)
@@ -2531,6 +2531,13 @@ static void tg3_carrier_off(struct tg3 *tp)
        tp->link_up = false;
 }
 
+static void tg3_warn_mgmt_link_flap(struct tg3 *tp)
+{
+       if (tg3_flag(tp, ENABLE_ASF))
+               netdev_warn(tp->dev,
+                           "Management side-band traffic will be interrupted during phy settings change\n");
+}
+
 /* This will reset the tigon3 PHY if there is no valid
  * link unless the FORCE argument is non-zero.
  */
@@ -11565,6 +11572,8 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                tp->link_config.duplex = cmd->duplex;
        }
 
+       tg3_warn_mgmt_link_flap(tp);
+
        if (netif_running(dev))
                tg3_setup_phy(tp, 1);
 
@@ -11643,6 +11652,8 @@ static int tg3_nway_reset(struct net_device *dev)
        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                return -EINVAL;
 
+       tg3_warn_mgmt_link_flap(tp);
+
        if (tg3_flag(tp, USE_PHYLIB)) {
                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                        return -EAGAIN;
@@ -11755,6 +11766,9 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
        struct tg3 *tp = netdev_priv(dev);
        int err = 0;
 
+       if (tp->link_config.autoneg == AUTONEG_ENABLE)
+               tg3_warn_mgmt_link_flap(tp);
+
        if (tg3_flag(tp, USE_PHYLIB)) {
                u32 newadv;
                struct phy_device *phydev;