Commit 0e8635a8 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b134472

drivers/net/rionet.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

drivers/net/wan/farsync.c

+0 −19
Original line number Diff line number Diff line
@@ -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);

drivers/staging/otus/wrap_pkt.c

+0 −3
Original line number Diff line number Diff line
@@ -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++;

include/linux/netdevice.h

+0 −4
Original line number Diff line number Diff line
@@ -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

net/decnet/dn_route.c

+1 −1
Original line number Diff line number Diff line
@@ -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)