sky2: remove restarting workaround flag

The whole restarting flag was introduced by Mike McCormack
and was a temporary duct tape patch around issues with transmits
inflight during restart. The problems it was covering are now
fixed and the code should have been reverted.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index bac187000e1989fe9c201c0d4550b551e85c2391..8a763f866614865e783a406f5f369a8b8275e01b 100644 (file)
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1496,8 +1496,6 @@ static int sky2_up(struct net_device *dev)
        sky2_set_vlan_mode(hw, port, sky2->vlgrp != NULL);
 #endif
 
-       sky2->restarting = 0;
-
        err = sky2_rx_start(sky2);
        if (err)
                goto err_out;
@@ -1508,9 +1506,6 @@ static int sky2_up(struct net_device *dev)
        sky2_write32(hw, B0_IMSK, imask);
        sky2_read32(hw, B0_IMSK);
 
-       /* wake queue incase we are restarting */
-       netif_wake_queue(dev);
-
        if (netif_msg_ifup(sky2))
                printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
 
@@ -1545,8 +1540,6 @@ static inline int tx_dist(unsigned tail, unsigned head)
 /* Number of list elements available for next tx */
 static inline int tx_avail(const struct sky2_port *sky2)
 {
-       if (unlikely(sky2->restarting))
-               return 0;
        return sky2->tx_pending - tx_dist(sky2->tx_cons, sky2->tx_prod);
 }
 
@@ -1850,10 +1843,6 @@ static int sky2_down(struct net_device *dev)
        if (netif_msg_ifdown(sky2))
                printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
 
-       /* explicitly shut off tx incase we're restarting */
-       sky2->restarting = 1;
-       netif_tx_disable(dev);
-
        /* Force flow control off */
        sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
 
@@ -2382,7 +2371,7 @@ static inline void sky2_tx_done(struct net_device *dev, u16 last)
 {
        struct sky2_port *sky2 = netdev_priv(dev);
 
-       if (likely(netif_running(dev) && !sky2->restarting))
+       if (netif_running(dev))
                sky2_tx_complete(sky2, last);
 }
 
@@ -4327,7 +4316,6 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
        spin_lock_init(&sky2->phy_lock);
        sky2->tx_pending = TX_DEF_PENDING;
        sky2->rx_pending = RX_DEF_PENDING;
-       sky2->restarting = 0;
 
        hw->dev[port] = dev;
 

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index c9548d6d567ca0283f620539cae2107f151cfc3b..65b94c366fbc365145467b29520f5585297591fa 100644 (file)
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2053,7 +2053,6 @@ struct sky2_port {
 #define SKY2_FLAG_AUTO_SPEED           0x0002
 #define SKY2_FLAG_AUTO_PAUSE           0x0004
 
-       u8                   restarting;
        enum flow_control    flow_mode;
        enum flow_control    flow_status;