Merge tag 'v4.4.207' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d999e50..ef891fd 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2594,6 +2594,7 @@ extern int netdev_flow_limit_table_len;
  */
 struct softnet_data {
        struct list_head        poll_list;
+       struct napi_struct      *current_napi;
        struct sk_buff_head     process_queue;
 
        /* stats */
@@ -2601,6 +2602,8 @@ struct softnet_data {
        unsigned int            time_squeeze;
        unsigned int            cpu_collision;
        unsigned int            received_rps;
+       unsigned int            gro_coalesced;
+
 #ifdef CONFIG_RPS
        struct softnet_data     *rps_ipi_list;
 #endif
@@ -3088,6 +3091,7 @@ struct sk_buff *napi_get_frags(struct napi_struct *napi);
 gro_result_t napi_gro_frags(struct napi_struct *napi);
 struct packet_offload *gro_find_receive_by_type(__be16 type);
 struct packet_offload *gro_find_complete_by_type(__be16 type);
+extern struct napi_struct *get_current_napi_context(void);
 
 static inline void napi_free_frags(struct napi_struct *napi)
 {