Update kernel headers to 3.9.0-rc1

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index aac8b8c09c5ffd5e0daecd16c31906717b2f5f2b..d37e53c370546a6ff1ea7cbd4d2dd794c0deb6f1 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -108,15 +108,26 @@ struct __fdb_entry {
  * [IFLA_AF_SPEC] = {
  *     [IFLA_BRIDGE_FLAGS]
  *     [IFLA_BRIDGE_MODE]
+ *     [IFLA_BRIDGE_VLAN_INFO]
  * }
  */
 enum {
        IFLA_BRIDGE_FLAGS,
        IFLA_BRIDGE_MODE,
+       IFLA_BRIDGE_VLAN_INFO,
        __IFLA_BRIDGE_MAX,
 };
 #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
 
+#define BRIDGE_VLAN_INFO_MASTER        (1<<0)  /* Operate on Bridge device as well */
+#define BRIDGE_VLAN_INFO_PVID  (1<<1)  /* VLAN is PVID, ingress untagged */
+#define BRIDGE_VLAN_INFO_UNTAGGED      (1<<2)  /* VLAN egresses untagged */
+
+struct bridge_vlan_info {
+       __u16 flags;
+       __u16 vid;
+};
+
 /* Bridge multicast database attributes
  * [MDBA_MDB] = {
  *     [MDBA_MDB_ENTRY] = {

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 730410a8ba7cec216d33ee49bc6e17be713e1aa2..6b5910af7fd28be03c12c90bdea72b6e643982a6 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -83,6 +83,7 @@
 #define ETH_P_802_EX1  0x88B5          /* 802.1 Local Experimental 1.  */
 #define ETH_P_TIPC     0x88CA          /* TIPC                         */
 #define ETH_P_8021AH   0x88E7          /* 802.1ah Backbone Service Tag */
+#define ETH_P_MVRP     0x88F5          /* 802.1Q MVRP                  */
 #define ETH_P_1588     0x88F7          /* IEEE 1588 Timesync */
 #define ETH_P_FCOE     0x8906          /* Fibre Channel over Ethernet  */
 #define ETH_P_TDLS     0x890D          /* TDLS */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 8ca3afe7e3b1606e6f7965ca3e57aef181a23ab0..40167af1f36a4ddd07ceebb30f1100c6aefdc8a4 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -142,6 +142,7 @@ enum {
 #define IFLA_PROMISCUITY IFLA_PROMISCUITY
        IFLA_NUM_TX_QUEUES,
        IFLA_NUM_RX_QUEUES,
+       IFLA_CARRIER,
        __IFLA_MAX
 };
 

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 3be1ca61218c6aefa23805b285ede51122a8963f..24ae007160a172ea18a08d65f9485a377e38de49 100644 (file)
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -34,6 +34,7 @@ enum vlan_flags {
        VLAN_FLAG_REORDER_HDR   = 0x1,
        VLAN_FLAG_GVRP          = 0x2,
        VLAN_FLAG_LOOSE_BINDING = 0x4,
+       VLAN_FLAG_MVRP          = 0x8,
 };
 
 enum vlan_name_types {

diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index 275e5d65dcb235dae4fcd15fb3a47971d277d19a..adb068c53c4e964fc1ea950a61f188b9159bc178 100644 (file)
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -20,6 +20,7 @@ enum {
        NDA_LLADDR,
        NDA_CACHEINFO,
        NDA_PROBES,
+       NDA_VLAN,
        __NDA_MAX
 };
 

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 87452b4f1062e6fd1da2813f1bfb426efcfc3e47..93370bd2c871e3912208529f34ae324cf872e5ef 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -628,6 +628,7 @@ struct tcamsg {
 
 /* New extended info filters for IFLA_EXT_MASK */
 #define RTEXT_FILTER_VF                (1 << 0)
+#define RTEXT_FILTER_BRVLAN    (1 << 1)
 
 /* End of information exported to user level */