[PATCH v2 -next] 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: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
 Change since v2:
  don't remove the POLICED initialisation in sch_atm, its used
  if we hit ACT_SHOT.

 I preseved Svens Reviewed-by since I did not change the BATMAN
 part in any way.

 include/linux/netdevice.h | 1 -
 net/batman-adv/routing.c  | 2 +-
 net/batman-adv/send.c     | 4 ++--
 net/core/pktgen.c         | 1 -
 net/sched/sch_api.c       | 2 --
 net/sched/sch_atm.c       | 2 +-
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 94eef35..d101e4d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h

@@ -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

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index e3857ed..f75091c 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c

@@ -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;
 	}

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index f2f1256..b1a4e8a 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c

@@ -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;

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8b02df0..f74ab9c 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c

@@ -3463,7 +3463,6 @@ xmit_more:
 		break;
 	case NET_XMIT_DROP:
 	case NET_XMIT_CN:
-	case NET_XMIT_POLICED:
 		/* skb has been consumed */
 		pkt_dev->errors++;
 		break;

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 401eda6..12ebde8 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c

@@ -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:
 

diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index 7e6c12d..0785b23 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c

@@ -363,7 +363,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 	struct atm_flow_data *flow;
 	struct tcf_result res;
 	int result;
-	int ret = NET_XMIT_POLICED;
+	int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
 
 	pr_debug("atm_tc_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);
 	result = TC_POLICE_OK;	/* be nice to gcc */

-- 
2.7.3

From: Florian Westphal <fw@strlen.de>
Date: Sat, 11 Jun 2016 12:46:04 +0200

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.

Yes, but it's been like this for two decades.

One of the points of my reply to the previous version of this
patch is that indeed it is explicitly returned, intentionally.

David Miller [off-list ref] wrote:

From: Florian Westphal <fw@strlen.de>
Date: Sat, 11 Jun 2016 12:46:04 +0200

quoted

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.

Yes, but it's been like this for two decades.

One of the points of my reply to the previous version of this
patch is that indeed it is explicitly returned, intentionally.

But nothing evaluates it?

Only exception is pktgen which treats it line _CN and _DROP...

[ But I dont mind if you'd rather leave it alone, I just find it
  silly we have a NET_XMIT_ that has no clear meaning or use ]

On Sat, Jun 11, 2016 at 3:54 PM, David Miller [off-list ref] wrote:

From: Florian Westphal <fw@strlen.de>
Date: Sat, 11 Jun 2016 12:46:04 +0200

quoted

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.

Yes, but it's been like this for two decades.

One of the points of my reply to the previous version of this
patch is that indeed it is explicitly returned, intentionally.

I think this is a leftover from CONFIG_NET_CLS_POLICE removal.

BTW, probably TC_POLICE_* can be removed together.

From: Cong Wang <redacted>
Date: Sat, 11 Jun 2016 17:14:09 -0700

On Sat, Jun 11, 2016 at 3:54 PM, David Miller [off-list ref] wrote:

quoted

From: Florian Westphal <fw@strlen.de>
Date: Sat, 11 Jun 2016 12:46:04 +0200

quoted

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.

Yes, but it's been like this for two decades.

One of the points of my reply to the previous version of this
patch is that indeed it is explicitly returned, intentionally.

I think this is a leftover from CONFIG_NET_CLS_POLICE removal.

BTW, probably TC_POLICE_* can be removed together.

Ok I'll apply this.