diff options
author | Mike Sinkovsky <msink@permonline.ru> | 2012-04-11 20:14:48 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-12 15:45:29 -0400 |
commit | 376b16f409232385db0f80faa0711b03fe404616 (patch) | |
tree | 3204474f3f2235592857ab8320266dd6de6ddf78 /drivers/net/ethernet/wiznet/w5100.c | |
parent | cade455596504fae8e134a27189713ddf7c6d04d (diff) | |
download | linux-stable-376b16f409232385db0f80faa0711b03fe404616.tar.gz linux-stable-376b16f409232385db0f80faa0711b03fe404616.tar.bz2 linux-stable-376b16f409232385db0f80faa0711b03fe404616.zip |
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>
Diffstat (limited to 'drivers/net/ethernet/wiznet/w5100.c')
-rw-r--r-- | drivers/net/ethernet/wiznet/w5100.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index c28e1d57b02d..a4079d7d1af0 100644 --- 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); } |