Showing the changes to include/uapi/linux (1 of 3 files). Show all
Unified · Split
| @@ -144,7 +144,7 @@ enum { · 143 unmodified lines | |||
| 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 { · 219 unmodified lines | |||
| 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 | ||