diff options
| author | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-01 21:24:14 +0200 |
|---|---|---|
| committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-23 23:00:38 +0200 |
| commit | c36936ce4bc6d2a0d6520bd798e85abbb139c2aa (patch) | |
| tree | 9dde2ac8a8a480ba9b19602254a851d67f55bae5 /drivers/net | |
| parent | ea966165a306ad4243b7bf62c848288c4286a8b7 (diff) | |
| download | kernel_samsung_aries-c36936ce4bc6d2a0d6520bd798e85abbb139c2aa.zip kernel_samsung_aries-c36936ce4bc6d2a0d6520bd798e85abbb139c2aa.tar.gz kernel_samsung_aries-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')
| -rw-r--r-- | drivers/net/wan/pc300.h | 8 | ||||
| -rw-r--r-- | drivers/net/wan/pc300_drv.c | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/wan/pc300.h b/drivers/net/wan/pc300.h index cd24ea5..cee799d 100644 --- a/drivers/net/wan/pc300.h +++ b/drivers/net/wan/pc300.h @@ -103,13 +103,9 @@ #include "hd64572.h" #include "pc300-falc-lh.h" -#ifndef CY_TYPES -#define CY_TYPES -typedef __u64 ucdouble; /* 64 bits, unsigned */ typedef __u32 uclong; /* 32 bits, unsigned */ typedef __u16 ucshort; /* 16 bits, unsigned */ typedef __u8 ucchar; /* 8 bits, unsigned */ -#endif /* CY_TYPES */ #define PC300_PROTO_MLPPP 1 @@ -345,7 +341,6 @@ typedef struct pc300chconf { raw_hdlc_proto proto_settings; /* Encoding, parity (CRC) */ uclong media; /* HW media (RS232, V.35, etc.) */ uclong proto; /* Protocol (PPP, X.25, etc.) */ - ucchar monitor; /* Monitor mode (0 = off, !0 = on) */ /* TE-specific parameters */ ucchar lcode; /* Line Code (AMI, B8ZS, etc.) */ @@ -440,9 +435,6 @@ enum pc300_loopback_cmds { #define PC300_DEF_MTU 1600 /* Function Prototypes */ -void tx_dma_start(pc300_t *, int); int cpc_open(struct net_device *dev); -int cpc_set_media(hdlc_device *, int); #endif /* _PC300_H */ - 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++; |