Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - avoid redundant multicast TT entries, by Linus Luessing - add netlink support for distributed arp table cache and multicast flags, by Linus Luessing (2 patches) ====================
Showing the changes to include/uapi/linux (1 of 6 files). Show all
Unified · Split
| @@ -91,6 +91,53 @@ enum batadv_tt_client_flags { · 90 unmodified lines | |||
| 91 | BATADV_TT_CLIENT_TEMP = (1 << 11), | 91 | BATADV_TT_CLIENT_TEMP = (1 << 11), |
| 92 | }; | 92 | }; |
| 93 | 93 | ||
| 94 | /** | ||
| 95 | * enum batadv_mcast_flags_priv - Private, own multicast flags | ||
| 96 | * | ||
| 97 | * These are internal, multicast related flags. Currently they describe certain | ||
| 98 | * multicast related attributes of the segment this originator bridges into the | ||
| 99 | * mesh. | ||
| 100 | * | ||
| 101 | * Those attributes are used to determine the public multicast flags this | ||
| 102 | * originator is going to announce via TT. | ||
| 103 | * | ||
| 104 | * For netlink, if BATADV_MCAST_FLAGS_BRIDGED is unset then all querier | ||
| 105 | * related flags are undefined. | ||
| 106 | */ | ||
| 107 | enum batadv_mcast_flags_priv { | ||
| 108 | /** | ||
| 109 | * @BATADV_MCAST_FLAGS_BRIDGED: There is a bridge on top of the mesh | ||
| 110 | * interface. | ||
| 111 | */ | ||
| 112 | BATADV_MCAST_FLAGS_BRIDGED = (1 << 0), | ||
| 113 | |||
| 114 | /** | ||
| 115 | * @BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS: Whether an IGMP querier | ||
| 116 | * exists in the mesh | ||
| 117 | */ | ||
| 118 | BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS = (1 << 1), | ||
| 119 | |||
| 120 | /** | ||
| 121 | * @BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS: Whether an MLD querier | ||
| 122 | * exists in the mesh | ||
| 123 | */ | ||
| 124 | BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS = (1 << 2), | ||
| 125 | |||
| 126 | /** | ||
| 127 | * @BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING: If an IGMP querier | ||
| 128 | * exists, whether it is potentially shadowing multicast listeners | ||
| 129 | * (i.e. querier is behind our own bridge segment) | ||
| 130 | */ | ||
| 131 | BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING = (1 << 3), | ||
| 132 | |||
| 133 | /** | ||
| 134 | * @BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING: If an MLD querier | ||
| 135 | * exists, whether it is potentially shadowing multicast listeners | ||
| 136 | * (i.e. querier is behind our own bridge segment) | ||
| 137 | */ | ||
| 138 | BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING = (1 << 4), | ||
| 139 | }; | ||
| 140 | |||
| 94 | /** | 141 | /** |
| 95 | * enum batadv_nl_attrs - batman-adv netlink attributes | 142 | * enum batadv_nl_attrs - batman-adv netlink attributes |
| 96 | */ | 143 | */ |
| @@ -272,6 +319,31 @@ enum batadv_nl_attrs { · 175 unmodified lines | |||
| 272 | */ | 319 | */ |
| 273 | BATADV_ATTR_BLA_CRC, | 320 | BATADV_ATTR_BLA_CRC, |
| 274 | 321 | ||
| 322 | /** | ||
| 323 | * @BATADV_ATTR_DAT_CACHE_IP4ADDRESS: Client IPv4 address | ||
| 324 | */ | ||
| 325 | BATADV_ATTR_DAT_CACHE_IP4ADDRESS, | ||
| 326 | |||
| 327 | /** | ||
| 328 | * @BATADV_ATTR_DAT_CACHE_HWADDRESS: Client MAC address | ||
| 329 | */ | ||
| 330 | BATADV_ATTR_DAT_CACHE_HWADDRESS, | ||
| 331 | |||
| 332 | /** | ||
| 333 | * @BATADV_ATTR_DAT_CACHE_VID: VLAN ID | ||
| 334 | */ | ||
| 335 | BATADV_ATTR_DAT_CACHE_VID, | ||
| 336 | |||
| 337 | /** | ||
| 338 | * @BATADV_ATTR_MCAST_FLAGS: Per originator multicast flags | ||
| 339 | */ | ||
| 340 | BATADV_ATTR_MCAST_FLAGS, | ||
| 341 | |||
| 342 | /** | ||
| 343 | * @BATADV_ATTR_MCAST_FLAGS_PRIV: Private, own multicast flags | ||
| 344 | */ | ||
| 345 | BATADV_ATTR_MCAST_FLAGS_PRIV, | ||
| 346 | |||
| 275 | /* add attributes above here, update the policy in netlink.c */ | 347 | /* add attributes above here, update the policy in netlink.c */ |
| 276 | 348 | ||
| 277 | /** | 349 | /** |
| @@ -361,6 +433,16 @@ enum batadv_nl_commands { · 83 unmodified lines | |||
| 361 | */ | 433 | */ |
| 362 | BATADV_CMD_GET_BLA_BACKBONE, | 434 | BATADV_CMD_GET_BLA_BACKBONE, |
| 363 | 435 | ||
| 436 | /** | ||
| 437 | * @BATADV_CMD_GET_DAT_CACHE: Query list of DAT cache entries | ||
| 438 | */ | ||
| 439 | BATADV_CMD_GET_DAT_CACHE, | ||
| 440 | |||
| 441 | /** | ||
| 442 | * @BATADV_CMD_GET_MCAST_FLAGS: Query list of multicast flags | ||
| 443 | */ | ||
| 444 | BATADV_CMD_GET_MCAST_FLAGS, | ||
| 445 | |||
| 364 | /* add new commands above here */ | 446 | /* add new commands above here */ |
| 365 | 447 | ||
| 366 | /** | 448 | /** |