Merge branch 'master' into tk71

[mv-sheeva.git] / include / linux / if.h

diff --git a/include/linux/if.h b/include/linux/if.h
index 53558ec59e1b16d4272f9cdd51e1a0ba4957facc..123959927745b7934cacea3e1aacf5c6303bcb1c 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -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
+                                        * datapath port */
 
 #define IF_GET_IFACE   0x0001          /* for querying only */
 #define IF_GET_PROTO   0x0002