diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-06-02 17:49:10 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-06-02 17:49:10 -0700 |
| commit | eadcbfa58ae8693f0d6a0f591d8f51d55cf068e1 (patch) | |
| tree | cff3f1c56a8bf15138b652ee9dab50dddd6edee5 /include/net/flowcache.h | |
| parent | c4beedb8a914af9c8c1b6e67c753adf411e05160 (diff) | |
| parent | 5ed02dbb497422bf225783f46e6eadd237d23d6b (diff) | |
Merge tag 'v4.12-rc3' into for-linus
Merge with mainline to get acpi_dev_present() needed by patches to
axp20x-pek driver.
Diffstat (limited to 'include/net/flowcache.h')
| -rw-r--r-- | include/net/flowcache.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/flowcache.h b/include/net/flowcache.h index 9caf3bfc8d2d..51eb971e8973 100644 --- a/include/net/flowcache.h +++ b/include/net/flowcache.h @@ -8,7 +8,7 @@ struct flow_cache_percpu { struct hlist_head *hash_table; - int hash_count; + unsigned int hash_count; u32 hash_rnd; int hash_rnd_recalc; struct tasklet_struct flush_tasklet; @@ -18,8 +18,8 @@ struct flow_cache { u32 hash_shift; struct flow_cache_percpu __percpu *percpu; struct hlist_node node; - int low_watermark; - int high_watermark; + unsigned int low_watermark; + unsigned int high_watermark; struct timer_list rnd_timer; }; #endif /* _NET_FLOWCACHE_H */ |