diff options
author | Florian Westphal <fw@strlen.de> | 2009-06-19 20:53:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-05 22:15:35 -0400 |
commit | 0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f (patch) | |
tree | fe9a6f5d21259e51d0ac87f00787b32248f2851a /drivers | |
parent | 6b1344724e10c166d9e3c17011ed879ddf302e94 (diff) |
net: remove NET_RX_BAD and NET_RX_CN* defines
almost no users in the tree; and the few that use them treat them
like NET_RX_DROP.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/rionet.c | 5 | ||||
-rw-r--r-- | drivers/net/wan/farsync.c | 19 | ||||
-rw-r--r-- | drivers/staging/otus/wrap_pkt.c | 3 |
3 files changed, 0 insertions, 27 deletions
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index 8702e7acdee6..74cdb6f8f84f 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c | |||
@@ -114,11 +114,6 @@ static int rionet_rx_clean(struct net_device *ndev) | |||
114 | 114 | ||
115 | if (error == NET_RX_DROP) { | 115 | if (error == NET_RX_DROP) { |
116 | ndev->stats.rx_dropped++; | 116 | ndev->stats.rx_dropped++; |
117 | } else if (error == NET_RX_BAD) { | ||
118 | if (netif_msg_rx_err(rnet)) | ||
119 | printk(KERN_WARNING "%s: bad rx packet\n", | ||
120 | DRV_NAME); | ||
121 | ndev->stats.rx_errors++; | ||
122 | } else { | 117 | } else { |
123 | ndev->stats.rx_packets++; | 118 | ndev->stats.rx_packets++; |
124 | ndev->stats.rx_bytes += RIO_MAX_MSG_SIZE; | 119 | ndev->stats.rx_bytes += RIO_MAX_MSG_SIZE; |
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 25c9ef6a1815..90c0a317d9d3 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
@@ -792,25 +792,6 @@ fst_process_rx_status(int rx_status, char *name) | |||
792 | */ | 792 | */ |
793 | break; | 793 | break; |
794 | } | 794 | } |
795 | |||
796 | case NET_RX_CN_LOW: | ||
797 | { | ||
798 | dbg(DBG_ASS, "%s: Receive Low Congestion\n", name); | ||
799 | break; | ||
800 | } | ||
801 | |||
802 | case NET_RX_CN_MOD: | ||
803 | { | ||
804 | dbg(DBG_ASS, "%s: Receive Moderate Congestion\n", name); | ||
805 | break; | ||
806 | } | ||
807 | |||
808 | case NET_RX_CN_HIGH: | ||
809 | { | ||
810 | dbg(DBG_ASS, "%s: Receive High Congestion\n", name); | ||
811 | break; | ||
812 | } | ||
813 | |||
814 | case NET_RX_DROP: | 795 | case NET_RX_DROP: |
815 | { | 796 | { |
816 | dbg(DBG_ASS, "%s: Received packet dropped\n", name); | 797 | dbg(DBG_ASS, "%s: Received packet dropped\n", name); |
diff --git a/drivers/staging/otus/wrap_pkt.c b/drivers/staging/otus/wrap_pkt.c index 5db0004c8739..89a6b92f5972 100644 --- a/drivers/staging/otus/wrap_pkt.c +++ b/drivers/staging/otus/wrap_pkt.c | |||
@@ -156,10 +156,7 @@ void zfLnxRecvEth(zdev_t* dev, zbuf_t* buf, u16_t port) | |||
156 | switch(netif_rx(buf)) | 156 | switch(netif_rx(buf)) |
157 | #endif | 157 | #endif |
158 | { | 158 | { |
159 | case NET_RX_BAD: | ||
160 | case NET_RX_DROP: | 159 | case NET_RX_DROP: |
161 | case NET_RX_CN_MOD: | ||
162 | case NET_RX_CN_HIGH: | ||
163 | break; | 160 | break; |
164 | default: | 161 | default: |
165 | macp->drv_stats.net_stats.rx_packets++; | 162 | macp->drv_stats.net_stats.rx_packets++; |