aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/rionet.c5
-rw-r--r--drivers/net/wan/farsync.c19
-rw-r--r--drivers/staging/otus/wrap_pkt.c3
-rw-r--r--include/linux/netdevice.h4
-rw-r--r--net/decnet/dn_route.c2
-rw-r--r--net/lapb/lapb_iface.c2
6 files changed, 2 insertions, 33 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++;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d4a4d9867794..9f25ab2899de 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -72,10 +72,6 @@ struct wireless_dev;
72/* Backlog congestion levels */ 72/* Backlog congestion levels */
73#define NET_RX_SUCCESS 0 /* keep 'em coming, baby */ 73#define NET_RX_SUCCESS 0 /* keep 'em coming, baby */
74#define NET_RX_DROP 1 /* packet dropped */ 74#define NET_RX_DROP 1 /* packet dropped */
75#define NET_RX_CN_LOW 2 /* storm alert, just in case */
76#define NET_RX_CN_MOD 3 /* Storm on its way! */
77#define NET_RX_CN_HIGH 4 /* The storm is here */
78#define NET_RX_BAD 5 /* packet dropped due to kernel error */
79 75
80/* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It 76/* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It
81 * indicates that the device will soon be dropping packets, or already drops 77 * indicates that the device will soon be dropping packets, or already drops
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 1d6ca8a98dc6..9383d3e5a1ab 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -774,7 +774,7 @@ static int dn_rt_bug(struct sk_buff *skb)
774 774
775 kfree_skb(skb); 775 kfree_skb(skb);
776 776
777 return NET_RX_BAD; 777 return NET_RX_DROP;
778} 778}
779 779
780static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res) 780static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
index 2ba1bc4f3c3a..bda96d18fd98 100644
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
@@ -407,7 +407,7 @@ int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
407 return lapb->callbacks.data_indication(lapb->dev, skb); 407 return lapb->callbacks.data_indication(lapb->dev, skb);
408 408
409 kfree_skb(skb); 409 kfree_skb(skb);
410 return NET_RX_CN_HIGH; /* For now; must be != NET_RX_DROP */ 410 return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
411} 411}
412 412
413int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb) 413int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb)