From 77b78028f12df6b64687fecfc4767a2f63632ae5 Mon Sep 17 00:00:00 2001 From: Mike Sinkovsky Date: Wed, 11 Apr 2012 20:14:48 +0000 Subject: [PATCH] --- yaml --- r: 300595 b: refs/heads/master c: 376b16f409232385db0f80faa0711b03fe404616 h: refs/heads/master i: 300593: 725f372ceb8ce52de0ae7894ae3353ed10e4d831 300591: 901e2b88e348412c1bc471ebd09d3b18ed6b3e69 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/wiznet/Kconfig | 8 -------- trunk/drivers/net/ethernet/wiznet/w5100.c | 5 ++--- trunk/drivers/net/ethernet/wiznet/w5300.c | 9 +++------ 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 5d3315dff1eb..c5a480e40670 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cade455596504fae8e134a27189713ddf7c6d04d +refs/heads/master: 376b16f409232385db0f80faa0711b03fe404616 diff --git a/trunk/drivers/net/ethernet/wiznet/Kconfig b/trunk/drivers/net/ethernet/wiznet/Kconfig index c8291bf905a7..cb18043f5830 100644 --- a/trunk/drivers/net/ethernet/wiznet/Kconfig +++ b/trunk/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/trunk/drivers/net/ethernet/wiznet/w5100.c b/trunk/drivers/net/ethernet/wiznet/w5100.c index c28e1d57b02d..a4079d7d1af0 100644 --- a/trunk/drivers/net/ethernet/wiznet/w5100.c +++ b/trunk/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/trunk/drivers/net/ethernet/wiznet/w5300.c b/trunk/drivers/net/ethernet/wiznet/w5300.c index 88afde99de8d..7bede7f5defa 100644 --- a/trunk/drivers/net/ethernet/wiznet/w5300.c +++ b/trunk/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); }