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 40eb61f93a3751964776befd1e8592e4e8397006..b3383a945d0bdddbc5f1f10164dd971c9468e739 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -21,8 +21,10 @@
 
 #include <linux/types.h>               /* for "__kernel_caddr_t" et al */
 #include <linux/socket.h>              /* for "struct sockaddr" et al  */
+               /* for "__user" et al           */
 
 #define        IFNAMSIZ        16
+#define        IFALIASZ        256
 #include <linux/hdlc/ioctl.h>
 
 /* Standard interface flags (netdevice->flags). */
@@ -63,6 +65,23 @@
 #define IFF_BONDING    0x20            /* bonding master or slave      */
 #define IFF_SLAVE_NEEDARP 0x40         /* need ARPs for validation     */
 #define IFF_ISATAP     0x80            /* ISATAP interface (RFC4214)   */
+#define IFF_MASTER_ARPMON 0x100                /* bonding master, ARP mon in use */
+#define IFF_WAN_HDLC   0x200           /* WAN HDLC device              */
+#define IFF_XMIT_DST_RELEASE 0x400     /* dev_hard_start_xmit() is allowed to
+                                        * release skb->dst
+                                        */
+#define IFF_DONT_BRIDGE 0x800          /* disallow bridging this ether dev */
+#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
@@ -118,8 +137,7 @@ enum {
  *     being very small might be worth keeping for clean configuration.
  */
 
-struct ifmap 
-{
+struct ifmap {
        unsigned long mem_start;
        unsigned long mem_end;
        unsigned short base_addr; 
@@ -129,21 +147,20 @@ struct ifmap
        /* 3 bytes spare */
 };
 
-struct if_settings
-{
+struct if_settings {
        unsigned int type;      /* Type of physical device or protocol */
        unsigned int size;      /* Size of the data allocated by the caller */
        union {
                /* {atm/eth/dsl}_settings anyone ? */
-               raw_hdlc_proto   *raw_hdlc;
-               cisco_proto      *cisco;
-               fr_proto         *fr;
-               fr_proto_pvc     *fr_pvc;
-               fr_proto_pvc_info *fr_pvc_info;
+               raw_hdlc_proto          *raw_hdlc;
+               cisco_proto             *cisco;
+               fr_proto                *fr;
+               fr_proto_pvc            *fr_pvc;
+               fr_proto_pvc_info       *fr_pvc_info;
 
                /* interface settings */
-               sync_serial_settings *sync;
-               te1_settings     *te1;
+               sync_serial_settings    *sync;
+               te1_settings            *te1;
        } ifs_ifsu;
 };
 
@@ -154,8 +171,7 @@ struct if_settings
  * remainder may be interface specific.
  */
 
-struct ifreq 
-{
+struct ifreq {
 #define IFHWADDRLEN    6
        union
        {
@@ -204,11 +220,9 @@ struct ifreq
  * must know all networks accessible).
  */
 
-struct ifconf 
-{
+struct ifconf  {
        int     ifc_len;                        /* size of buffer       */
-       union 
-       {
+       union {
                char *ifcu_buf;
                struct ifreq *ifcu_req;
        } ifc_ifcu;