History

Merge tag 'batadv-next-pullrequest-20250313' of git://git.open-mesh.org/linux-merge

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 ====================

Paolo Abeni committed 1 year ago

Commit ed6bcbe2 parents aedfbe2 7cfb32438 files · +917 −935Browse files

Showing the changes to include/uapi (1 of 38 files). Show all

Unified · Split

include/uapi/linux/batman_adv.h+9−9
@@ -342,7 +342,7 @@ enum batadv_nl_attrs { · 341 unmodified lines
342342 BATADV_ATTR_MCAST_FLAGS_PRIV,
343343
344344 /**
345− * @BATADV_ATTR_VLANID: VLAN id on top of soft interface
345+ * @BATADV_ATTR_VLANID: VLAN id on top of mesh interface
346346 */
347347 BATADV_ATTR_VLANID,
348348
@@ -380,7 +380,7 @@ enum batadv_nl_attrs { · 31 unmodified lines
380380 /**
381381 * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop
382382 * 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
384384 */
385385 BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,
386386
@@ -509,7 +509,7 @@ enum batadv_nl_commands { · 122 unmodified lines
509509 BATADV_CMD_UNSPEC,
510510
511511 /**
512− * @BATADV_CMD_GET_MESH: Get attributes from softif/mesh
512+ * @BATADV_CMD_GET_MESH: Get attributes from mesh(if)
513513 */
514514 BATADV_CMD_GET_MESH,
515515
@@ -535,7 +535,7 @@ enum batadv_nl_commands { · 19 unmodified lines
535535
536536 /**
537537 * @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the
538− * current softif
538+ * current mesh(if)
539539 */
540540 BATADV_CMD_GET_HARDIF,
541541
@@ -591,25 +591,25 @@ enum batadv_nl_commands { · 49 unmodified lines
591591 BATADV_CMD_GET_MCAST_FLAGS,
592592
593593 /**
594− * @BATADV_CMD_SET_MESH: Set attributes for softif/mesh
594+ * @BATADV_CMD_SET_MESH: Set attributes for mesh(if)
595595 */
596596 BATADV_CMD_SET_MESH,
597597
598598 /**
599599 * @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the
600− * current softif
600+ * current mesh(if)
601601 */
602602 BATADV_CMD_SET_HARDIF,
603603
604604 /**
605605 * @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the
606− * current softif
606+ * current mesh(if)
607607 */
608608 BATADV_CMD_GET_VLAN,
609609
610610 /**
611611 * @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the
612− * current softif
612+ * current mesh(if)
613613 */
614614 BATADV_CMD_SET_VLAN,
615615
@@ -691,7 +691,7 @@ enum batadv_ifla_attrs { · 75 unmodified lines
691691 */
692692 IFLA_BATADV_ALGO_NAME,
693693
694− /* add attributes above here, update the policy in soft-interface.c */
694+ /* add attributes above here, update the policy in mesh-interface.c */
695695
696696 /**
697697 * @__IFLA_BATADV_MAX: internal use