drivers/net: Remove CONFIG_WIZNET_TX_FLOW option

This option was there for debugging race conditions,
just remove it, and assume TX_FLOW is always enabled.

Signed-off-by: Mike Sinkovsky <msink@permonline.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/wiznet/Kconfig b/drivers/net/ethernet/wiznet/Kconfig
index c8291bf905a79eea9bdfa9a1d3f6a63dbe9f9d78..cb18043f5830bbb6414e870455f7c46203a0f6fe 100644 (file)
--- a/drivers/net/ethernet/wiznet/Kconfig
+++ b/drivers/net/ethernet/wiznet/Kconfig
@@ -70,12 +70,4 @@ config WIZNET_BUS_ANY
          Performance may decrease compared to explicitly selected bus mode.
 endchoice
 
-config WIZNET_TX_FLOW
-       bool "Use transmit flow control"
-       depends on WIZNET_W5100 || WIZNET_W5300
-       default y
-       help
-         This enables transmit flow control for WIZnet chips.
-         If unsure, say Y.
-
 endif # NET_VENDOR_WIZNET

diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index c28e1d57b02d81d647ad8abddc24790a322d8858..a4079d7d1af09dff4934c56781b50551a9a50c2b 100644 (file)
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -441,8 +441,7 @@ static int w5100_start_tx(struct sk_buff *skb, struct net_device *ndev)
        struct w5100_priv *priv = netdev_priv(ndev);
        u16 offset;
 
-       if (IS_ENABLED(CONFIG_WIZNET_TX_FLOW))
-               netif_stop_queue(ndev);
+       netif_stop_queue(ndev);
 
        offset = w5100_read16(priv, W5100_S0_TX_WR);
        w5100_writebuf(priv, offset, skb->data, skb->len);
@@ -517,7 +516,7 @@ static irqreturn_t w5100_interrupt(int irq, void *ndev_instance)
        w5100_write(priv, W5100_S0_IR, ir);
        mmiowb();
 
-       if (IS_ENABLED(CONFIG_WIZNET_TX_FLOW) && (ir & S0_IR_SENDOK)) {
+       if (ir & S0_IR_SENDOK) {
                netif_dbg(priv, tx_done, ndev, "tx done\n");
                netif_wake_queue(ndev);
        }

diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 88afde99de8da8548b3692c89bc6ea203a54367c..7bede7f5defa3ee9904e31fe412ee814113bc1d6 100644 (file)
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -273,9 +273,7 @@ static void w5300_hw_start(struct w5300_priv *priv)
                          S0_MR_MACRAW : S0_MR_MACRAW_MF);
        mmiowb();
        w5300_command(priv, S0_CR_OPEN);
-       w5300_write(priv, W5300_S0_IMR, IS_ENABLED(CONFIG_WIZNET_TX_FLOW) ?
-                                       S0_IR_RECV | S0_IR_SENDOK :
-                                       S0_IR_RECV);
+       w5300_write(priv, W5300_S0_IMR, S0_IR_RECV | S0_IR_SENDOK);
        w5300_write(priv, W5300_IMR, IR_S0);
        mmiowb();
 }
@@ -371,8 +369,7 @@ static int w5300_start_tx(struct sk_buff *skb, struct net_device *ndev)
 {
        struct w5300_priv *priv = netdev_priv(ndev);
 
-       if (IS_ENABLED(CONFIG_WIZNET_TX_FLOW))
-               netif_stop_queue(ndev);
+       netif_stop_queue(ndev);
 
        w5300_write_frame(priv, skb->data, skb->len);
        mmiowb();
@@ -439,7 +436,7 @@ static irqreturn_t w5300_interrupt(int irq, void *ndev_instance)
        w5300_write(priv, W5300_S0_IR, ir);
        mmiowb();
 
-       if (IS_ENABLED(CONFIG_WIZNET_TX_FLOW) && (ir & S0_IR_SENDOK)) {
+       if (ir & S0_IR_SENDOK) {
                netif_dbg(priv, tx_done, ndev, "tx done\n");
                netif_wake_queue(ndev);
        }