aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-05-09 13:42:46 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-13 14:07:23 -0400
commitbdc220da3209d50b8c295490dec94845c88670a2 (patch)
tree00113e90fecf388f084622380774c0b175728954
parent72a8f97bf2dfe1b0f02ba8dbaed7d6b76657aae3 (diff)
netdevice.h: Align struct net_device members
Save a bit of space. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/netdevice.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1d9696a9ee4..a134d809125 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1020,9 +1020,6 @@ struct net_device {
1020 * part of the usual set specified in Space.c. 1020 * part of the usual set specified in Space.c.
1021 */ 1021 */
1022 1022
1023 unsigned char if_port; /* Selectable AUI, TP,..*/
1024 unsigned char dma; /* DMA channel */
1025
1026 unsigned long state; 1023 unsigned long state;
1027 1024
1028 struct list_head dev_list; 1025 struct list_head dev_list;
@@ -1146,13 +1143,16 @@ struct net_device {
1146 const struct header_ops *header_ops; 1143 const struct header_ops *header_ops;
1147 1144
1148 unsigned int flags; /* interface flags (a la BSD) */ 1145 unsigned int flags; /* interface flags (a la BSD) */
1146 unsigned int priv_flags; /* Like 'flags' but invisible to userspace. */
1149 unsigned short gflags; 1147 unsigned short gflags;
1150 unsigned int priv_flags; /* Like 'flags' but invisible to userspace. */
1151 unsigned short padded; /* How much padding added by alloc_netdev() */ 1148 unsigned short padded; /* How much padding added by alloc_netdev() */
1152 1149
1153 unsigned char operstate; /* RFC2863 operstate */ 1150 unsigned char operstate; /* RFC2863 operstate */
1154 unsigned char link_mode; /* mapping policy to operstate */ 1151 unsigned char link_mode; /* mapping policy to operstate */
1155 1152
1153 unsigned char if_port; /* Selectable AUI, TP,..*/
1154 unsigned char dma; /* DMA channel */
1155
1156 unsigned int mtu; /* interface MTU value */ 1156 unsigned int mtu; /* interface MTU value */
1157 unsigned short type; /* interface hardware type */ 1157 unsigned short type; /* interface hardware type */
1158 unsigned short hard_header_len; /* hardware hdr length */ 1158 unsigned short hard_header_len; /* hardware hdr length */