Update kernel headers to 3.13-rc2

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 9cb5909c6a9244ad2fa380a1f15da68e1e691c99..f08505c367e10f2c8280f34921c6f7ba654d4b50 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -144,7 +144,6 @@ enum {
        IFLA_NUM_RX_QUEUES,
        IFLA_CARRIER,
        IFLA_PHYS_PORT_ID,
-       IFLA_SLAVE,
        __IFLA_MAX
 };
 
@@ -239,6 +238,8 @@ enum {
        IFLA_INFO_KIND,
        IFLA_INFO_DATA,
        IFLA_INFO_XSTATS,
+       IFLA_INFO_SLAVE_KIND,
+       IFLA_INFO_SLAVE_DATA,
        __IFLA_INFO_MAX,
 };
 
@@ -357,6 +358,7 @@ enum {
 #define IFLA_BOND_MAX  (__IFLA_BOND_MAX - 1)
 
 enum {
+       IFLA_BOND_AD_INFO_UNSPEC,
        IFLA_BOND_AD_INFO_AGGREGATOR,
        IFLA_BOND_AD_INFO_NUM_PORTS,
        IFLA_BOND_AD_INFO_ACTOR_KEY,
@@ -368,16 +370,17 @@ enum {
 #define IFLA_BOND_AD_INFO_MAX  (__IFLA_BOND_AD_INFO_MAX - 1)
 
 enum {
-       IFLA_SLAVE_STATE,
-       IFLA_SLAVE_MII_STATUS,
-       IFLA_SLAVE_LINK_FAILURE_COUNT,
-       IFLA_SLAVE_PERM_HWADDR,
-       IFLA_SLAVE_QUEUE_ID,
-       IFLA_SLAVE_AD_AGGREGATOR_ID,
-       __IFLA_SLAVE_MAX,
+       IFLA_BOND_SLAVE_UNSPEC,
+       IFLA_BOND_SLAVE_STATE,
+       IFLA_BOND_SLAVE_MII_STATUS,
+       IFLA_BOND_SLAVE_LINK_FAILURE_COUNT,
+       IFLA_BOND_SLAVE_PERM_HWADDR,
+       IFLA_BOND_SLAVE_QUEUE_ID,
+       IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,
+       __IFLA_BOND_SLAVE_MAX,
 };
 
-#define IFLA_SLAVE_MAX (__IFLA_SLAVE_MAX - 1)
+#define IFLA_BOND_SLAVE_MAX    (__IFLA_BOND_SLAVE_MAX - 1)
 
 /* SR-IOV virtual function management section */
 

diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index f175212420ab0bd1f4ffbdae7cac60457b77bb3c..d3ef583104e0c905503a3911c33ca4018294e7de 100644 (file)
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -58,7 +58,7 @@ enum {
 
 /* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change
    and make no address resolution or NUD.
-   NUD_PERMANENT is also cannot be deleted by garbage collectors.
+   NUD_PERMANENT also cannot be deleted by garbage collectors.
  */
 
 struct nda_cacheinfo {