diff options
author | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-01 15:24:14 -0400 |
---|---|---|
committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-23 17:00:38 -0400 |
commit | c36936ce4bc6d2a0d6520bd798e85abbb139c2aa (patch) | |
tree | 9dde2ac8a8a480ba9b19602254a851d67f55bae5 /drivers/net/wan/pc300_drv.c | |
parent | ea966165a306ad4243b7bf62c848288c4286a8b7 (diff) |
WAN: Remove dead code from PC300 driver, part #2
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'drivers/net/wan/pc300_drv.c')
-rw-r--r-- | drivers/net/wan/pc300_drv.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 3226a745571a..65c40cd4a08f 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
@@ -1805,11 +1805,7 @@ static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1805 | int i; | 1805 | int i; |
1806 | #endif | 1806 | #endif |
1807 | 1807 | ||
1808 | if (chan->conf.monitor) { | 1808 | if (!netif_carrier_ok(dev)) { |
1809 | /* In monitor mode no Tx is done: ignore packet */ | ||
1810 | dev_kfree_skb(skb); | ||
1811 | return 0; | ||
1812 | } else if (!netif_carrier_ok(dev)) { | ||
1813 | /* DCD must be OFF: drop packet */ | 1809 | /* DCD must be OFF: drop packet */ |
1814 | dev_kfree_skb(skb); | 1810 | dev_kfree_skb(skb); |
1815 | dev->stats.tx_errors++; | 1811 | dev->stats.tx_errors++; |