aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2010-08-23 12:26:41 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-23 23:43:17 -0400
commit1726442e115a9e58f40747d009a5b4f303e0840a (patch)
treefbf95da050125bfa0656292c54bd856cf113db37 /include/linux/netdevice.h
parent0fdc100bdc4b7ab61ed632962c76dfe539047296 (diff)
net: increase the size of priv_flags and add IFF_OVS_DATAPATH
IFF_OVS_DATAPATH is a place-holder for the Open vSwitch datapath which I am preparing to submit for merging. As all 16 bits of priv_flags are already assigned flags, also increase the size of priv_flags to 32 bits. Unfortunately, by my calculations this increases the size of struct net_device by 4 bytes on 32bit architectures and 8 bytes on 64 bit architectures. I couldn't see an obvious way to avoid that. Cc: Jesse Gross <jesse@nicira.com> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index ce2de8b64083..59962dbc2758 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -901,7 +901,7 @@ struct net_device {
901 901
902 unsigned int flags; /* interface flags (a la BSD) */ 902 unsigned int flags; /* interface flags (a la BSD) */
903 unsigned short gflags; 903 unsigned short gflags;
904 unsigned short priv_flags; /* Like 'flags' but invisible to userspace. */ 904 unsigned int priv_flags; /* Like 'flags' but invisible to userspace. */
905 unsigned short padded; /* How much padding added by alloc_netdev() */ 905 unsigned short padded; /* How much padding added by alloc_netdev() */
906 906
907 unsigned char operstate; /* RFC2863 operstate */ 907 unsigned char operstate; /* RFC2863 operstate */