Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 4 deletions

diff --git a/include/linux/if.h b/include/linux/if.h
index 53558ec59e1b..3bc63e6a02f7 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -71,10 +71,11 @@
                                          * release skb->dst
                                          */
 #define IFF_DONT_BRIDGE 0x800           /* disallow bridging this ether dev */
-#define IFF_IN_NETPOLL  0x1000          /* whether we are processing netpoll */
-#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_DISABLE_NETPOLL     0x1000  /* disable netpoll at run-time */
+#define IFF_MACVLAN_PORT        0x2000  /* device used as macvlan port */
+#define IFF_BRIDGE_PORT 0x4000          /* device used as bridge port */
+#define IFF_OVS_DATAPATH        0x8000  /* device used as Open vSwitch
+                                         * datapath port */
 
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002