update kernel headers to net-next (3.18-rc6)

Early merge of upstream headers

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index ed6868ecebacdd7860890cf3dc9b14f76b5bb623..6b4eb66d445316af391ecc05becb95a0f17b728b 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -105,6 +105,7 @@ struct __fdb_entry {
 
 #define BRIDGE_MODE_VEB                0       /* Default loopback mode */
 #define BRIDGE_MODE_VEPA       1       /* 802.1Qbg defined VEPA mode */
+#define BRIDGE_MODE_SWDEV      2       /* Full switch device offload */
 
 /* Bridge management nested attributes
  * [IFLA_AF_SPEC] = {

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 47320636361c18cdc57971cf990d82ef6a130e1d..167ec34bab73ba280ff9e2aee43213a118470ef8 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -145,6 +145,7 @@ enum {
        IFLA_CARRIER,
        IFLA_PHYS_PORT_ID,
        IFLA_CARRIER_CHANGES,
+       IFLA_PHYS_SWITCH_ID,
        __IFLA_MAX
 };
 
@@ -241,6 +242,8 @@ enum {
        IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave    */
        IFLA_BRPORT_LEARNING,   /* mac learning */
        IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
+       IFLA_BRPORT_PROXYARP,   /* proxy ARP */
+       IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -327,6 +330,21 @@ enum macvlan_macaddr_mode {
 
 #define MACVLAN_FLAG_NOPROMISC 1
 
+/* IPVLAN section */
+enum {
+       IFLA_IPVLAN_UNSPEC,
+       IFLA_IPVLAN_MODE,
+       __IFLA_IPVLAN_MAX
+};
+
+#define IFLA_IPVLAN_MAX (__IFLA_IPVLAN_MAX - 1)
+
+enum ipvlan_mode {
+       IPVLAN_MODE_L2 = 0,
+       IPVLAN_MODE_L3,
+       IPVLAN_MODE_MAX
+};
+
 /* VXLAN section */
 enum {
        IFLA_VXLAN_UNSPEC,

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 8b04f328279b46032c59df6e6e095427ab7495be..102ce7aab12efbf1f61c53d06dfc2c0cf960b3b7 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -69,6 +69,7 @@ enum tunnel_encap_types {
 
 #define TUNNEL_ENCAP_FLAG_CSUM         (1<<0)
 #define TUNNEL_ENCAP_FLAG_CSUM6                (1<<1)
+#define TUNNEL_ENCAP_FLAG_REMCSUM      (1<<2)
 
 /* SIT-mode i_flags */
 #define        SIT_ISATAP      0x0001

diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index 4a1d7e96dfe3d7ccf8669428a943ed53af37828e..f3d77f9f1e0bb582b1f1ca02fd8bd99ff60729dd 100644 (file)
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -35,11 +35,11 @@ enum {
  */
 
 #define NTF_USE                0x01
-#define NTF_PROXY      0x08    /* == ATF_PUBL */
-#define NTF_ROUTER     0x80
-
 #define NTF_SELF       0x02
 #define NTF_MASTER     0x04
+#define NTF_PROXY      0x08    /* == ATF_PUBL */
+#define NTF_EXT_LEARNED        0x10
+#define NTF_ROUTER     0x80
 
 /*
  *     Neighbor Cache Entry States.

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index ae23d94f977cc80de4f51071b350474447633c4e..9aa5c2f93dba048a8c673f7786febf6205f49adf 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -237,7 +237,6 @@ enum {
 #define RTPROT_MROUTED 17      /* Multicast daemon */
 #define RTPROT_BABEL   42      /* Babel daemon */
 
-
 /* rtm_scope
 
    Really it is not scope, but sort of distance to the destination.