Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 376b16f4 authored by Mike Sinkovsky's avatar Mike Sinkovsky Committed by David S. Miller
Browse files

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: default avatarMike Sinkovsky <msink@permonline.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cade4555

drivers/net/ethernet/wiznet/Kconfig

+0 −8
Original line number Original line Diff line number Diff line
@@ -70,12 +70,4 @@ config WIZNET_BUS_ANY 
	  Performance may decrease compared to explicitly selected bus mode.

	  Performance may decrease compared to explicitly selected bus mode.

endchoice

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
 
endif # NET_VENDOR_WIZNET

drivers/net/ethernet/wiznet/w5100.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -441,7 +441,6 @@ static int w5100_start_tx(struct sk_buff *skb, struct net_device *ndev) 
	struct w5100_priv *priv = netdev_priv(ndev);

	struct w5100_priv *priv = netdev_priv(ndev);

	u16 offset;

	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);

	offset = w5100_read16(priv, W5100_S0_TX_WR);
@@ -517,7 +516,7 @@ static irqreturn_t w5100_interrupt(int irq, void *ndev_instance) 
	w5100_write(priv, W5100_S0_IR, ir);

	w5100_write(priv, W5100_S0_IR, ir);

	mmiowb();

	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_dbg(priv, tx_done, ndev, "tx done\n");

		netif_wake_queue(ndev);

		netif_wake_queue(ndev);

	}

	}

drivers/net/ethernet/wiznet/w5300.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -273,9 +273,7 @@ static void w5300_hw_start(struct w5300_priv *priv) 
			  S0_MR_MACRAW : S0_MR_MACRAW_MF);

			  S0_MR_MACRAW : S0_MR_MACRAW_MF);

	mmiowb();

	mmiowb();

	w5300_command(priv, S0_CR_OPEN);

	w5300_command(priv, S0_CR_OPEN);

	w5300_write(priv, W5300_S0_IMR, IS_ENABLED(CONFIG_WIZNET_TX_FLOW) ?

	w5300_write(priv, W5300_S0_IMR, S0_IR_RECV | S0_IR_SENDOK);

					S0_IR_RECV | S0_IR_SENDOK :

					S0_IR_RECV);

	w5300_write(priv, W5300_IMR, IR_S0);

	w5300_write(priv, W5300_IMR, IR_S0);

	mmiowb();

	mmiowb();

}

}
@@ -371,7 +369,6 @@ static int w5300_start_tx(struct sk_buff *skb, struct net_device *ndev) 
{

{

	struct w5300_priv *priv = netdev_priv(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);

	w5300_write_frame(priv, skb->data, skb->len);
@@ -439,7 +436,7 @@ static irqreturn_t w5300_interrupt(int irq, void *ndev_instance) 
	w5300_write(priv, W5300_S0_IR, ir);

	w5300_write(priv, W5300_S0_IR, ir);

	mmiowb();

	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_dbg(priv, tx_done, ndev, "tx done\n");

		netif_wake_queue(ndev);

		netif_wake_queue(ndev);

	}

	}