diff options
| author | Florian Westphal | 2016-05-03 03:29:09 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-05-03 04:51:41 +0200 |
| commit | c0ef079ca791ef9e057ac748051425a768c9e192 (patch) | |
| tree | 16235e037fac8565efc4baa06c4b6fd161e26803 | |
| parent | Merge branch 'bridge-per-vlan-stats' (diff) | |
| download | kernel-qcow2-linux-c0ef079ca791ef9e057ac748051425a768c9e192.tar.gz kernel-qcow2-linux-c0ef079ca791ef9e057ac748051425a768c9e192.tar.xz kernel-qcow2-linux-c0ef079ca791ef9e057ac748051425a768c9e192.zip | |
netdevice: shrink size of struct netdev_queue
- trans_timeout is incremented when tx queue timed out (tx watchdog).
- tx_maxrate is set via sysfs
Moving tx_maxrate to read-mostly part shrinks the struct by 64 bytes.
While at it, also move trans_timeout (it is out-of-place in the
'write-mostly' part).
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/netdevice.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 52914a854386..f2182594160e 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -569,6 +569,12 @@ struct netdev_queue { #if defined(CONFIG_XPS) && defined(CONFIG_NUMA) int numa_node; #endif + unsigned long tx_maxrate; + /* + * Number of TX timeouts for this queue + * (/sys/class/net/DEV/Q/trans_timeout) + */ + unsigned long trans_timeout; /* * write-mostly part */ @@ -579,18 +585,11 @@ struct netdev_queue { */ unsigned long trans_start; - /* - * Number of TX timeouts for this queue - * (/sys/class/net/DEV/Q/trans_timeout) - */ - unsigned long trans_timeout; - unsigned long state; #ifdef CONFIG_BQL struct dql dql; #endif - unsigned long tx_maxrate; } ____cacheline_aligned_in_smp; static inline int netdev_queue_numa_node_read(const struct netdev_queue *q) |