Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

sched: remove NET_XMIT_POLICED 



sch_atm returns this when TC_ACT_SHOT classification occurs.

But all other schedulers that use tc_classify
(htb, hfsc, drr, fq_codel ...) return NET_XMIT_SUCCESS | __BYPASS
in this case so just do that in atm.

BATMAN uses it as an intermediate return value to signal
forwarding vs. buffering, but it did not return POLICED to
callers outside of BATMAN.

Reviewed-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb37c563

include/linux/netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ void netdev_set_default_ethtool_ops(struct net_device *dev, 
#define NET_XMIT_SUCCESS	0x00

#define NET_XMIT_DROP		0x01	/* skb dropped			*/

#define NET_XMIT_CN		0x02	/* congestion notification	*/

#define NET_XMIT_POLICED	0x03	/* skb is shot by police	*/

#define NET_XMIT_MASK		0x0f	/* qdisc flags in net/sch_generic.h */



/* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It

net/batman-adv/routing.c

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, 
				   len + ETH_HLEN);



		ret = NET_RX_SUCCESS;

	} else if (res == NET_XMIT_POLICED) {

	} else if (res == -EINPROGRESS) {

		/* skb was buffered and consumed */

		ret = NET_RX_SUCCESS;

	}

net/batman-adv/send.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb, 
 * attempted.

 *

 * Return: NET_XMIT_SUCCESS on success, NET_XMIT_DROP on failure, or

 * NET_XMIT_POLICED if the skb is buffered for later transmit.

 * -EINPROGRESS if the skb is buffered for later transmit.

 */

int batadv_send_skb_to_orig(struct sk_buff *skb,

			    struct batadv_orig_node *orig_node,
@@ -188,7 +188,7 @@ int batadv_send_skb_to_orig(struct sk_buff *skb, 
	 * network coding fails, then send the packet as usual.

	 */

	if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) {

		ret = NET_XMIT_POLICED;

		ret = -EINPROGRESS;

	} else {

		batadv_send_unicast_skb(skb, neigh_node);

		ret = NET_XMIT_SUCCESS;

net/core/pktgen.c

+0 −1
Original line number Diff line number Diff line
@@ -3463,7 +3463,6 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev) 
		break;

	case NET_XMIT_DROP:

	case NET_XMIT_CN:

	case NET_XMIT_POLICED:

		/* skb has been consumed */

		pkt_dev->errors++;

		break;

net/sched/sch_api.c

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ static int tclass_notify(struct net *net, struct sk_buff *oskb, 
     Expected action: do not backoff, but wait until queue will clear.

   NET_XMIT_CN	 	- probably this packet enqueued, but another one dropped.

     Expected action: backoff or ignore

   NET_XMIT_POLICED	- dropped by police.

     Expected action: backoff or error to real-time apps.



   Auxiliary routines: