diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_macvlan.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/if_link.h | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 6b2c7cf352a5..6f6929ea8a0c 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h | |||
| @@ -60,6 +60,7 @@ struct macvlan_dev { | |||
| 60 | #ifdef CONFIG_NET_POLL_CONTROLLER | 60 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 61 | struct netpoll *netpoll; | 61 | struct netpoll *netpoll; |
| 62 | #endif | 62 | #endif |
| 63 | unsigned int macaddr_count; | ||
| 63 | }; | 64 | }; |
| 64 | 65 | ||
| 65 | static inline void macvlan_count_rx(const struct macvlan_dev *vlan, | 66 | static inline void macvlan_count_rx(const struct macvlan_dev *vlan, |
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index c80f95f6ee78..0bdb77e16875 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h | |||
| @@ -303,6 +303,10 @@ enum { | |||
| 303 | IFLA_MACVLAN_UNSPEC, | 303 | IFLA_MACVLAN_UNSPEC, |
| 304 | IFLA_MACVLAN_MODE, | 304 | IFLA_MACVLAN_MODE, |
| 305 | IFLA_MACVLAN_FLAGS, | 305 | IFLA_MACVLAN_FLAGS, |
| 306 | IFLA_MACVLAN_MACADDR_MODE, | ||
| 307 | IFLA_MACVLAN_MACADDR, | ||
| 308 | IFLA_MACVLAN_MACADDR_DATA, | ||
| 309 | IFLA_MACVLAN_MACADDR_COUNT, | ||
| 306 | __IFLA_MACVLAN_MAX, | 310 | __IFLA_MACVLAN_MAX, |
| 307 | }; | 311 | }; |
| 308 | 312 | ||
| @@ -313,6 +317,14 @@ enum macvlan_mode { | |||
| 313 | MACVLAN_MODE_VEPA = 2, /* talk to other ports through ext bridge */ | 317 | MACVLAN_MODE_VEPA = 2, /* talk to other ports through ext bridge */ |
| 314 | MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ | 318 | MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ |
| 315 | MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */ | 319 | MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */ |
| 320 | MACVLAN_MODE_SOURCE = 16,/* use source MAC address list to assign */ | ||
| 321 | }; | ||
| 322 | |||
| 323 | enum macvlan_macaddr_mode { | ||
| 324 | MACVLAN_MACADDR_ADD, | ||
| 325 | MACVLAN_MACADDR_DEL, | ||
| 326 | MACVLAN_MACADDR_FLUSH, | ||
| 327 | MACVLAN_MACADDR_SET, | ||
| 316 | }; | 328 | }; |
| 317 | 329 | ||
| 318 | #define MACVLAN_FLAG_NOPROMISC 1 | 330 | #define MACVLAN_FLAG_NOPROMISC 1 |
