Simon Wunderlich says: ==================== This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Add flex array to struct batadv_tvlv_tt_data, by Erick Archer - Use string choice helper to print booleans, by Sven Eckelmann - replace call_rcu by kfree_rcu for simple kmem_cache_free callback, by Julia Lawall * tag 'batadv-next-pullrequest-20241015' of git://git.open-mesh.org/linux-merge: batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback batman-adv: Use string choice helper to print booleans batman-adv: Add flex array to struct batadv_tvlv_tt_data batman-adv: Start new development cycle ====================
Showing the changes to include/uapi (1 of 5 files). Show all
Unified · Split
| @@ -9,6 +9,7 @@ · 8 unmodified lines | |||
| 9 | 9 | ||
| 10 | #include <asm/byteorder.h> | 10 | #include <asm/byteorder.h> |
| 11 | #include <linux/if_ether.h> | 11 | #include <linux/if_ether.h> |
| 12 | #include <linux/stddef.h> | ||
| 12 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 13 | 14 | ||
| 14 | /** | 15 | /** |
| @@ -592,19 +593,6 @@ struct batadv_tvlv_gateway_data { · 577 unmodified lines | |||
| 592 | __be32 bandwidth_up; | 593 | __be32 bandwidth_up; |
| 593 | }; | 594 | }; |
| 594 | 595 | ||
| 595 | /** | ||
| 596 | * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container | ||
| 597 | * @flags: translation table flags (see batadv_tt_data_flags) | ||
| 598 | * @ttvn: translation table version number | ||
| 599 | * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by | ||
| 600 | * one batadv_tvlv_tt_vlan_data object per announced vlan | ||
| 601 | */ | ||
| 602 | struct batadv_tvlv_tt_data { | ||
| 603 | __u8 flags; | ||
| 604 | __u8 ttvn; | ||
| 605 | __be16 num_vlan; | ||
| 606 | }; | ||
| 607 | |||
| 608 | /** | 596 | /** |
| 609 | * struct batadv_tvlv_tt_vlan_data - vlan specific tt data propagated through | 597 | * struct batadv_tvlv_tt_vlan_data - vlan specific tt data propagated through |
| 610 | * the tt tvlv container | 598 | * the tt tvlv container |
| @@ -618,6 +606,21 @@ struct batadv_tvlv_tt_vlan_data { · 7 unmodified lines | |||
| 618 | __u16 reserved; | 606 | __u16 reserved; |
| 619 | }; | 607 | }; |
| 620 | 608 | ||
| 609 | /** | ||
| 610 | * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container | ||
| 611 | * @flags: translation table flags (see batadv_tt_data_flags) | ||
| 612 | * @ttvn: translation table version number | ||
| 613 | * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by | ||
| 614 | * one batadv_tvlv_tt_vlan_data object per announced vlan | ||
| 615 | * @vlan_data: array of batadv_tvlv_tt_vlan_data objects | ||
| 616 | */ | ||
| 617 | struct batadv_tvlv_tt_data { | ||
| 618 | __u8 flags; | ||
| 619 | __u8 ttvn; | ||
| 620 | __be16 num_vlan; | ||
| 621 | struct batadv_tvlv_tt_vlan_data vlan_data[] __counted_by_be(num_vlan); | ||
| 622 | }; | ||
| 623 | |||
| 621 | /** | 624 | /** |
| 622 | * struct batadv_tvlv_tt_change - translation table diff data | 625 | * struct batadv_tvlv_tt_change - translation table diff data |
| 623 | * @flags: status indicators concerning the non-mesh client (see | 626 | * @flags: status indicators concerning the non-mesh client (see |