Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - drop batadv_priv_debug_log struct, by Sven Eckelmann - adopt netdev_hold() / netdev_put(), by Eric Dumazet - add support for jumbo frames, by Sven Eckelmann - use consistent name for mesh interface, by Sven Eckelmann - cleanup B.A.T.M.A.N. IV OGM aggregation handling, by Sven Eckelmann (4 patches) - add missing newlines for log macros, by Sven Eckelmann * tag 'batadv-next-pullrequest-20250313' of git://git.open-mesh.org/linux-merge: batman-adv: add missing newlines for log macros batman-adv: Limit aggregation size to outgoing MTU batman-adv: Use actual packet count for aggregated packets batman-adv: Switch to bitmap helper for aggregation handling batman-adv: Limit number of aggregated packets directly batman-adv: Use consistent name for mesh interface batman-adv: Add support for jumbo frames batman-adv: adopt netdev_hold() / netdev_put() batman-adv: Drop batadv_priv_debug_log struct batman-adv: Start new development cycle ====================
Showing the changes to include/uapi/linux (1 of 38 files). Show all
Unified · Split
| @@ -342,7 +342,7 @@ enum batadv_nl_attrs { · 341 unmodified lines | |||
| 342 | BATADV_ATTR_MCAST_FLAGS_PRIV, | 342 | BATADV_ATTR_MCAST_FLAGS_PRIV, |
| 343 | 343 | ||
| 344 | /** | 344 | /** |
| 345 | * @BATADV_ATTR_VLANID: VLAN id on top of soft interface | 345 | * @BATADV_ATTR_VLANID: VLAN id on top of mesh interface |
| 346 | */ | 346 | */ |
| 347 | BATADV_ATTR_VLANID, | 347 | BATADV_ATTR_VLANID, |
| 348 | 348 | ||
| @@ -380,7 +380,7 @@ enum batadv_nl_attrs { · 31 unmodified lines | |||
| 380 | /** | 380 | /** |
| 381 | * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop | 381 | * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop |
| 382 | * avoidance feature is enabled. This feature detects and avoids loops | 382 | * avoidance feature is enabled. This feature detects and avoids loops |
| 383 | * between the mesh and devices bridged with the soft interface | 383 | * between the mesh and devices bridged with the mesh interface |
| 384 | */ | 384 | */ |
| 385 | BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED, | 385 | BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED, |
| 386 | 386 | ||
| @@ -509,7 +509,7 @@ enum batadv_nl_commands { · 122 unmodified lines | |||
| 509 | BATADV_CMD_UNSPEC, | 509 | BATADV_CMD_UNSPEC, |
| 510 | 510 | ||
| 511 | /** | 511 | /** |
| 512 | * @BATADV_CMD_GET_MESH: Get attributes from softif/mesh | 512 | * @BATADV_CMD_GET_MESH: Get attributes from mesh(if) |
| 513 | */ | 513 | */ |
| 514 | BATADV_CMD_GET_MESH, | 514 | BATADV_CMD_GET_MESH, |
| 515 | 515 | ||
| @@ -535,7 +535,7 @@ enum batadv_nl_commands { · 19 unmodified lines | |||
| 535 | 535 | ||
| 536 | /** | 536 | /** |
| 537 | * @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the | 537 | * @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the |
| 538 | * current softif | 538 | * current mesh(if) |
| 539 | */ | 539 | */ |
| 540 | BATADV_CMD_GET_HARDIF, | 540 | BATADV_CMD_GET_HARDIF, |
| 541 | 541 | ||
| @@ -591,25 +591,25 @@ enum batadv_nl_commands { · 49 unmodified lines | |||
| 591 | BATADV_CMD_GET_MCAST_FLAGS, | 591 | BATADV_CMD_GET_MCAST_FLAGS, |
| 592 | 592 | ||
| 593 | /** | 593 | /** |
| 594 | * @BATADV_CMD_SET_MESH: Set attributes for softif/mesh | 594 | * @BATADV_CMD_SET_MESH: Set attributes for mesh(if) |
| 595 | */ | 595 | */ |
| 596 | BATADV_CMD_SET_MESH, | 596 | BATADV_CMD_SET_MESH, |
| 597 | 597 | ||
| 598 | /** | 598 | /** |
| 599 | * @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the | 599 | * @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the |
| 600 | * current softif | 600 | * current mesh(if) |
| 601 | */ | 601 | */ |
| 602 | BATADV_CMD_SET_HARDIF, | 602 | BATADV_CMD_SET_HARDIF, |
| 603 | 603 | ||
| 604 | /** | 604 | /** |
| 605 | * @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the | 605 | * @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the |
| 606 | * current softif | 606 | * current mesh(if) |
| 607 | */ | 607 | */ |
| 608 | BATADV_CMD_GET_VLAN, | 608 | BATADV_CMD_GET_VLAN, |
| 609 | 609 | ||
| 610 | /** | 610 | /** |
| 611 | * @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the | 611 | * @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the |
| 612 | * current softif | 612 | * current mesh(if) |
| 613 | */ | 613 | */ |
| 614 | BATADV_CMD_SET_VLAN, | 614 | BATADV_CMD_SET_VLAN, |
| 615 | 615 | ||
| @@ -691,7 +691,7 @@ enum batadv_ifla_attrs { · 75 unmodified lines | |||
| 691 | */ | 691 | */ |
| 692 | IFLA_BATADV_ALGO_NAME, | 692 | IFLA_BATADV_ALGO_NAME, |
| 693 | 693 | ||
| 694 | /* add attributes above here, update the policy in soft-interface.c */ | 694 | /* add attributes above here, update the policy in mesh-interface.c */ |
| 695 | 695 | ||
| 696 | /** | 696 | /** |
| 697 | * @__IFLA_BATADV_MAX: internal use | 697 | * @__IFLA_BATADV_MAX: internal use |