diff options
author | Eric Dumazet <edumazet@google.com> | 2012-09-26 03:07:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-27 19:29:35 -0400 |
commit | 404f7c9e118e0c92902afe1853d35f5638fe4a4c (patch) | |
tree | 91fef7641a22df0e1acf262777b29fe8c0be9cad /include/linux/netdevice.h | |
parent | 69b08f62e17439ee3d436faf0b9a7ca6fffb78db (diff) |
net: struct napi_struct fields reordering
Remove two holes on 64bit arches, and put dev_list at the end of
napi_struct since its not used in fast path.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 6c131f055ab0..dd320bb22a5a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -338,18 +338,16 @@ struct napi_struct { | |||
338 | 338 | ||
339 | unsigned long state; | 339 | unsigned long state; |
340 | int weight; | 340 | int weight; |
341 | unsigned int gro_count; | ||
341 | int (*poll)(struct napi_struct *, int); | 342 | int (*poll)(struct napi_struct *, int); |
342 | #ifdef CONFIG_NETPOLL | 343 | #ifdef CONFIG_NETPOLL |
343 | spinlock_t poll_lock; | 344 | spinlock_t poll_lock; |
344 | int poll_owner; | 345 | int poll_owner; |
345 | #endif | 346 | #endif |
346 | |||
347 | unsigned int gro_count; | ||
348 | |||
349 | struct net_device *dev; | 347 | struct net_device *dev; |
350 | struct list_head dev_list; | ||
351 | struct sk_buff *gro_list; | 348 | struct sk_buff *gro_list; |
352 | struct sk_buff *skb; | 349 | struct sk_buff *skb; |
350 | struct list_head dev_list; | ||
353 | }; | 351 | }; |
354 | 352 | ||
355 | enum { | 353 | enum { |