Skip to content

Commit

Permalink
WAN: Remove dead code from PC300 driver, part #2
Browse files Browse the repository at this point in the history
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
  • Loading branch information
Krzysztof Hałasa committed Jul 23, 2008
1 parent ea96616 commit c36936c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
8 changes: 0 additions & 8 deletions drivers/net/wan/pc300.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.) */
Expand Down Expand Up @@ -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 */

6 changes: 1 addition & 5 deletions drivers/net/wan/pc300_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down

0 comments on commit c36936c

Please sign in to comment.