Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1726442e authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

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: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fdc100b

include/linux/if.h

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ 
#define IFF_DISABLE_NETPOLL	0x2000	/* disable netpoll at run-time */

#define IFF_MACVLAN_PORT	0x4000	/* device used as macvlan port */

#define IFF_BRIDGE_PORT	0x8000		/* device used as bridge port */

#define IFF_OVS_DATAPATH	0x10000	/* device used as Open vSwitch

					 * dapath port */



#define IF_GET_IFACE	0x0001		/* for querying only */

#define IF_GET_PROTO	0x0002

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ struct net_device { 


	unsigned int		flags;	/* interface flags (a la BSD)	*/

	unsigned short		gflags;

        unsigned short          priv_flags; /* Like 'flags' but invisible to userspace. */

        unsigned int            priv_flags; /* Like 'flags' but invisible to userspace. */

	unsigned short		padded;	/* How much padding added by alloc_netdev() */



	unsigned char		operstate; /* RFC2863 operstate */