Merge branch 'enic'

Govindarajulu Varadarajan says:

====================
enic updates

This series fixes minor bugs and adds new features like Accelerated RFS,
busy_poll, tx clean-up in napi_poll.

v3:
* While doing tx cleanup in napi, ignore budget and clean up all desc possible.

v2:
* Fix #ifdef coding style issue in '[PATCH 4/8] enic: alloc/free rx_cpu_rmap'
  And [PATCH 5/8] enic: Add Accelerated RFS support'
====================

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

2 files changed, 15 insertions, 1 deletions

diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h
index 7e64bd8bbda9..fbefdca5e283 100644
--- a/include/net/flow_keys.h
+++ b/include/net/flow_keys.h
@@ -1,6 +1,19 @@
 #ifndef _NET_FLOW_KEYS_H
 #define _NET_FLOW_KEYS_H
 
+/* struct flow_keys:
+ *      @src: source ip address in case of IPv4
+ *            For IPv6 it contains 32bit hash of src address
+ *      @dst: destination ip address in case of IPv4
+ *            For IPv6 it contains 32bit hash of dst address
+ *      @ports: port numbers of Transport header
+ *              port16[0]: src port number
+ *              port16[1]: dst port number
+ *      @thoff: Transport header offset
+ *      @n_proto: Network header protocol (eg. IPv4/IPv6)
+ *      @ip_proto: Transport header protocol (eg. TCP/UDP)
+ * All the members, except thoff, are in network byte order.
+ */
 struct flow_keys {
         /* (src,dst) must be grouped, in the same way than in IP header */
         __be32 src;
@@ -10,6 +23,7 @@ struct flow_keys {
                 __be16 port16[2];
         };
         u16 thoff;
+        u16 n_proto;
         u8 ip_proto;
 };
 
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 624f9857c83e..a3cfb8ebeb53 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -231,7 +231,7 @@ struct qdisc_skb_cb {
         unsigned int            pkt_len;
         u16                     slave_dev_queue_mapping;
         u16                     _pad;
-        unsigned char           data[20];
+        unsigned char           data[24];
 };
 
 static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)