Merge branch 'net-mini_Qdisc'

Jiri Pirko says:

====================
net: core: introduce mini_Qdisc and eliminate usage of tp->q for clsact fastpath

This patchset's main patch is patch number 2. It carries the
description. Patch 1 is just a dependency.

---
v3->v4:
- rebased to be applicable on top of the current net-next
v2->v3:
- Using head change callback to replace miniq pointer every time tp head
  changes. This eliminates one rcu dereference and makes the claim "without
  added overhead" valid.
v1->v2:
- Use dev instead of skb->dev in sch_handle_egress as pointed out by Daniel
- Fixed synchronize_rcu_bh() in mini_qdisc_disable and commented
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 3 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5e02f79b2110..7de7656550c2 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1559,6 +1559,8 @@ enum netdev_priv_flags {
  *
  *      @rx_handler:            handler for received packets
  *      @rx_handler_data:       XXX: need comments on this one
+ *      @miniq_ingress:         ingress/clsact qdisc specific data for
+ *                              ingress processing
  *      @ingress_queue:         XXX: need comments on this one
  *      @broadcast:             hw bcast address
  *
@@ -1576,7 +1578,8 @@ enum netdev_priv_flags {
  *      @tx_global_lock:        XXX: need comments on this one
  *
  *      @xps_maps:      XXX: need comments on this one
- *
+ *      @miniq_egress:          clsact qdisc specific data for
+ *                              egress processing
  *      @watchdog_timeo:        Represents the timeout that is used by
  *                              the watchdog (see dev_watchdog())
  *      @watchdog_timer:        List of timers
@@ -1795,7 +1798,7 @@ struct net_device {
         void __rcu              *rx_handler_data;
 
 #ifdef CONFIG_NET_CLS_ACT
-        struct tcf_proto __rcu  *ingress_cl_list;
+        struct mini_Qdisc __rcu *miniq_ingress;
 #endif
         struct netdev_queue __rcu *ingress_queue;
 #ifdef CONFIG_NETFILTER_INGRESS
@@ -1826,7 +1829,7 @@ struct net_device {
         struct xps_dev_maps __rcu *xps_maps;
 #endif
 #ifdef CONFIG_NET_CLS_ACT
-        struct tcf_proto __rcu  *egress_cl_list;
+        struct mini_Qdisc __rcu *miniq_egress;
 #endif
 
         /* These may be needed for future network-power-down code. */