aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/pc300_drv.c
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khc@pm.waw.pl>2008-07-01 21:24:14 +0200
committerKrzysztof Hałasa <khc@pm.waw.pl>2008-07-23 23:00:38 +0200
commitc36936ce4bc6d2a0d6520bd798e85abbb139c2aa (patch)
tree9dde2ac8a8a480ba9b19602254a851d67f55bae5 /drivers/net/wan/pc300_drv.c
parentea966165a306ad4243b7bf62c848288c4286a8b7 (diff)
downloadkernel_samsung_smdk4412-c36936ce4bc6d2a0d6520bd798e85abbb139c2aa.zip
kernel_samsung_smdk4412-c36936ce4bc6d2a0d6520bd798e85abbb139c2aa.tar.gz
kernel_samsung_smdk4412-c36936ce4bc6d2a0d6520bd798e85abbb139c2aa.tar.bz2
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.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 3226a74..65c40cd 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)
int i;
#endif
- if (chan->conf.monitor) {
- /* In monitor mode no Tx is done: ignore packet */
- dev_kfree_skb(skb);
- return 0;
- } else if (!netif_carrier_ok(dev)) {
+ if (!netif_carrier_ok(dev)) {
/* DCD must be OFF: drop packet */
dev_kfree_skb(skb);
dev->stats.tx_errors++;