Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 00:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

WAN: Remove dead code from PC300 driver, part #2

Browse Source 
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
This commit is contained in:
Krzysztof Hałasa 2008-07-01 21:24:14 +02:00
parent ea966165a3
commit c36936ce4b
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wan/pc300.h
View File

@ -103,13 +103,9 @@
#include "hd64572.h" #include "hd64572.h"
#include "pc300-falc-lh.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 __u32 uclong; /* 32 bits, unsigned */
typedef __u16 ucshort; /* 16 bits, unsigned */ typedef __u16 ucshort; /* 16 bits, unsigned */
typedef __u8 ucchar; /* 8 bits, unsigned */ typedef __u8 ucchar; /* 8 bits, unsigned */
#endif /* CY_TYPES */
#define PC300_PROTO_MLPPP 1 #define PC300_PROTO_MLPPP 1
@ -345,7 +341,6 @@ typedef struct pc300chconf {
raw_hdlc_proto proto_settings; /* Encoding, parity (CRC) */ raw_hdlc_proto proto_settings; /* Encoding, parity (CRC) */
uclong media; /* HW media (RS232, V.35, etc.) */ uclong media; /* HW media (RS232, V.35, etc.) */
uclong proto; /* Protocol (PPP, X.25, etc.) */ uclong proto; /* Protocol (PPP, X.25, etc.) */
ucchar monitor; /* Monitor mode (0 = off, !0 = on) */
/* TE-specific parameters */ /* TE-specific parameters */
ucchar lcode; /* Line Code (AMI, B8ZS, etc.) */ ucchar lcode; /* Line Code (AMI, B8ZS, etc.) */
@ -440,9 +435,6 @@ enum pc300_loopback_cmds {
#define PC300_DEF_MTU 1600 #define PC300_DEF_MTU 1600
/* Function Prototypes */ /* Function Prototypes */
void tx_dma_start(pc300_t *, int);
int cpc_open(struct net_device *dev); int cpc_open(struct net_device *dev);
int cpc_set_media(hdlc_device *, int);
#endif /* _PC300_H */ #endif /* _PC300_H */

6
drivers/net/wan/pc300_drv.c
View File

@ -1805,11 +1805,7 @@ static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev)
int i; int i;
#endif #endif
if (chan->conf.monitor) { if (!netif_carrier_ok(dev)) {
/* In monitor mode no Tx is done: ignore packet */
dev_kfree_skb(skb);
return 0;
} else if (!netif_carrier_ok(dev)) {
/* DCD must be OFF: drop packet */ /* DCD must be OFF: drop packet */
dev_kfree_skb(skb); dev_kfree_skb(skb);
dev->stats.tx_errors++; dev->stats.tx_errors++;