diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-01-22 03:05:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-23 00:57:05 -0500 |
commit | df7dbcbbafc0b8f3fb31a40c6f3c4a7e15cb0b40 (patch) | |
tree | 4df36f32c23aac6895c62b147f0305036a3c8b0a /include/uapi | |
parent | 0a9099f8836cd5f91f811078b367e0227e0a20f6 (diff) |
rtnetlink: put "BOND" into nl attribute names which are related to bonding
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/if_link.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index ba2f3bf5fdf5..1f30b85ebf9d 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h | |||
@@ -144,7 +144,7 @@ enum { | |||
144 | IFLA_NUM_RX_QUEUES, | 144 | IFLA_NUM_RX_QUEUES, |
145 | IFLA_CARRIER, | 145 | IFLA_CARRIER, |
146 | IFLA_PHYS_PORT_ID, | 146 | IFLA_PHYS_PORT_ID, |
147 | IFLA_SLAVE, | 147 | IFLA_BOND_SLAVE, |
148 | __IFLA_MAX | 148 | __IFLA_MAX |
149 | }; | 149 | }; |
150 | 150 | ||
@@ -370,16 +370,17 @@ enum { | |||
370 | #define IFLA_BOND_AD_INFO_MAX (__IFLA_BOND_AD_INFO_MAX - 1) | 370 | #define IFLA_BOND_AD_INFO_MAX (__IFLA_BOND_AD_INFO_MAX - 1) |
371 | 371 | ||
372 | enum { | 372 | enum { |
373 | IFLA_SLAVE_STATE, | 373 | IFLA_BOND_SLAVE_UNSPEC, |
374 | IFLA_SLAVE_MII_STATUS, | 374 | IFLA_BOND_SLAVE_STATE, |
375 | IFLA_SLAVE_LINK_FAILURE_COUNT, | 375 | IFLA_BOND_SLAVE_MII_STATUS, |
376 | IFLA_SLAVE_PERM_HWADDR, | 376 | IFLA_BOND_SLAVE_LINK_FAILURE_COUNT, |
377 | IFLA_SLAVE_QUEUE_ID, | 377 | IFLA_BOND_SLAVE_PERM_HWADDR, |
378 | IFLA_SLAVE_AD_AGGREGATOR_ID, | 378 | IFLA_BOND_SLAVE_QUEUE_ID, |
379 | __IFLA_SLAVE_MAX, | 379 | IFLA_BOND_SLAVE_AD_AGGREGATOR_ID, |
380 | __IFLA_BOND_SLAVE_MAX, | ||
380 | }; | 381 | }; |
381 | 382 | ||
382 | #define IFLA_SLAVE_MAX (__IFLA_SLAVE_MAX - 1) | 383 | #define IFLA_BOND_SLAVE_MAX (__IFLA_BOND_SLAVE_MAX - 1) |
383 | 384 | ||
384 | /* SR-IOV virtual function management section */ | 385 | /* SR-IOV virtual function management section */ |
385 | 386 | ||