matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update kernel headers to 3.13-rc2

This commit is contained in:
Stephen Hemminger 2014-02-10 14:40:33 -08:00
parent a37c74724a
commit 8cfeddabce
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/linux/if_link.h
View File

@ -144,7 +144,6 @@ enum {
IFLA_NUM_RX_QUEUES, IFLA_NUM_RX_QUEUES,
IFLA_CARRIER, IFLA_CARRIER,
IFLA_PHYS_PORT_ID, IFLA_PHYS_PORT_ID,
IFLA_SLAVE,
__IFLA_MAX __IFLA_MAX
}; };
@ -239,6 +238,8 @@ enum {
IFLA_INFO_KIND, IFLA_INFO_KIND,
IFLA_INFO_DATA, IFLA_INFO_DATA,
IFLA_INFO_XSTATS, IFLA_INFO_XSTATS,
IFLA_INFO_SLAVE_KIND,
IFLA_INFO_SLAVE_DATA,
__IFLA_INFO_MAX, __IFLA_INFO_MAX,
}; };
@ -357,6 +358,7 @@ enum {
#define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1) #define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1)
enum { enum {
IFLA_BOND_AD_INFO_UNSPEC,
IFLA_BOND_AD_INFO_AGGREGATOR, IFLA_BOND_AD_INFO_AGGREGATOR,
IFLA_BOND_AD_INFO_NUM_PORTS, IFLA_BOND_AD_INFO_NUM_PORTS,
IFLA_BOND_AD_INFO_ACTOR_KEY, IFLA_BOND_AD_INFO_ACTOR_KEY,
@ -368,16 +370,17 @@ enum {
#define IFLA_BOND_AD_INFO_MAX (__IFLA_BOND_AD_INFO_MAX - 1) #define IFLA_BOND_AD_INFO_MAX (__IFLA_BOND_AD_INFO_MAX - 1)
enum { enum {
IFLA_SLAVE_STATE, IFLA_BOND_SLAVE_UNSPEC,
IFLA_SLAVE_MII_STATUS, IFLA_BOND_SLAVE_STATE,
IFLA_SLAVE_LINK_FAILURE_COUNT, IFLA_BOND_SLAVE_MII_STATUS,
IFLA_SLAVE_PERM_HWADDR, IFLA_BOND_SLAVE_LINK_FAILURE_COUNT,
IFLA_SLAVE_QUEUE_ID, IFLA_BOND_SLAVE_PERM_HWADDR,
IFLA_SLAVE_AD_AGGREGATOR_ID, IFLA_BOND_SLAVE_QUEUE_ID,
__IFLA_SLAVE_MAX, 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 */ /* SR-IOV virtual function management section */

2
include/linux/neighbour.h
View File

@ -58,7 +58,7 @@ enum {
/* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change /* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change
and make no address resolution or NUD. 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 { struct nda_cacheinfo {