mirror of
https://github.com/adulau/aha.git
synced 2024-12-26 18:56:14 +00:00
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>
This commit is contained in:
parent
6b1344724e
commit
0e8635a8e1
6 changed files with 2 additions and 33 deletions
|
@ -114,11 +114,6 @@ static int rionet_rx_clean(struct net_device *ndev)
|
|||
|
||||
if (error == NET_RX_DROP) {
|
||||
ndev->stats.rx_dropped++;
|
||||
} else if (error == NET_RX_BAD) {
|
||||
if (netif_msg_rx_err(rnet))
|
||||
printk(KERN_WARNING "%s: bad rx packet\n",
|
||||
DRV_NAME);
|
||||
ndev->stats.rx_errors++;
|
||||
} else {
|
||||
ndev->stats.rx_packets++;
|
||||
ndev->stats.rx_bytes += RIO_MAX_MSG_SIZE;
|
||||
|
|
|
@ -792,25 +792,6 @@ fst_process_rx_status(int rx_status, char *name)
|
|||
*/
|
||||
break;
|
||||
}
|
||||
|
||||
case NET_RX_CN_LOW:
|
||||
{
|
||||
dbg(DBG_ASS, "%s: Receive Low Congestion\n", name);
|
||||
break;
|
||||
}
|
||||
|
||||
case NET_RX_CN_MOD:
|
||||
{
|
||||
dbg(DBG_ASS, "%s: Receive Moderate Congestion\n", name);
|
||||
break;
|
||||
}
|
||||
|
||||
case NET_RX_CN_HIGH:
|
||||
{
|
||||
dbg(DBG_ASS, "%s: Receive High Congestion\n", name);
|
||||
break;
|
||||
}
|
||||
|
||||
case NET_RX_DROP:
|
||||
{
|
||||
dbg(DBG_ASS, "%s: Received packet dropped\n", name);
|
||||
|
|
|
@ -156,10 +156,7 @@ void zfLnxRecvEth(zdev_t* dev, zbuf_t* buf, u16_t port)
|
|||
switch(netif_rx(buf))
|
||||
#endif
|
||||
{
|
||||
case NET_RX_BAD:
|
||||
case NET_RX_DROP:
|
||||
case NET_RX_CN_MOD:
|
||||
case NET_RX_CN_HIGH:
|
||||
break;
|
||||
default:
|
||||
macp->drv_stats.net_stats.rx_packets++;
|
||||
|
|
|
@ -72,10 +72,6 @@ struct wireless_dev;
|
|||
/* Backlog congestion levels */
|
||||
#define NET_RX_SUCCESS 0 /* keep 'em coming, baby */
|
||||
#define NET_RX_DROP 1 /* packet dropped */
|
||||
#define NET_RX_CN_LOW 2 /* storm alert, just in case */
|
||||
#define NET_RX_CN_MOD 3 /* Storm on its way! */
|
||||
#define NET_RX_CN_HIGH 4 /* The storm is here */
|
||||
#define NET_RX_BAD 5 /* packet dropped due to kernel error */
|
||||
|
||||
/* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It
|
||||
* indicates that the device will soon be dropping packets, or already drops
|
||||
|
|
|
@ -774,7 +774,7 @@ static int dn_rt_bug(struct sk_buff *skb)
|
|||
|
||||
kfree_skb(skb);
|
||||
|
||||
return NET_RX_BAD;
|
||||
return NET_RX_DROP;
|
||||
}
|
||||
|
||||
static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
|
||||
|
|
|
@ -407,7 +407,7 @@ int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
|
|||
return lapb->callbacks.data_indication(lapb->dev, skb);
|
||||
|
||||
kfree_skb(skb);
|
||||
return NET_RX_CN_HIGH; /* For now; must be != NET_RX_DROP */
|
||||
return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
|
||||
}
|
||||
|
||||
int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb)
|
||||
|
|
Loading…
Reference in a new issue