Merge in 3.3-rc2 kernel headers

[lisovros/iproute2_canprio.git] / include / linux / if.h

diff --git a/include/linux/if.h b/include/linux/if.h
index a272e379ec2248a975e8b847ac4b861f7226694f..b3383a945d0bdddbc5f1f10164dd971c9468e739 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -71,8 +71,17 @@
                                         * 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_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 IFF_TX_SKB_SHARING     0x10000 /* The interface supports sharing
+                                        * skbs on transmit */
+#define IFF_UNICAST_FLT        0x20000         /* Supports unicast filtering   */
+#define IFF_TEAM_PORT  0x40000         /* device used as team port */
+#define IFF_SUPP_NOFCS 0x80000         /* device supports sending custom FCS */
+
 
 #define IF_GET_IFACE   0x0001          /* for querying only */
 #define IF_GET_PROTO   0x0002