History

Merge tag 'batadv-next-pullrequest-20260605' of https://git.open-mesh.org/batadv

Simon Wunderlich says: ==================== This cleanup patchset includes the following patches, all by Sven Eckelmann: - tp_meter: initialize last_recv_time during init - convert cancellation of work items to disable helper - clean up wifi detection cache (3 patches) - clean up kernel-doc: corrections, reword, typos (6 patches) * tag 'batadv-next-pullrequest-20260605' of https://git.open-mesh.org/batadv: batman-adv: fix kernel-doc typos and grammar errors batman-adv: fix batadv_v_ogm_packet_recv error handling kernel-doc batman-adv: uapi: keep kernel-doc in struct member order batman-adv: bla: update stale kernel-doc batman-adv: tp_meter: update stale kernel-doc after refactoring batman-adv: correct batadv_wifi_* kernel-doc batman-adv: document cleanup of batadv_wifi_net_devices entries batman-adv: use GFP_KERNEL allocations for the wifi detection cache batman-adv: drop duplicated wifi_flags assignments batman-adv: convert cancellation of work items to disable helper batman-adv: tp_meter: initialize last_recv_time during init ====================

Jakub Kicinski committed 5 months ago

Commit 4ed4f602 parents d337bc6 1e2fa2b23 files · +85 −67Browse files

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

Unified · Split

include/uapi/linux/batadv_packet.h+3−3
@@ -518,16 +518,16 @@ struct batadv_mcast_packet { · 517 unmodified lines
518518 * @packet_type: batman-adv packet type, part of the general header
519519 * @version: batman-adv protocol version, part of the general header
520520 * @ttl: time to live for this packet, part of the general header
521+ * @first_ttvn: tt-version number of first included packet
521522 * @first_source: original source of first included packet
522523 * @first_orig_dest: original destination of first included packet
523524 * @first_crc: checksum of first included packet
524− * @first_ttvn: tt-version number of first included packet
525525 * @second_ttl: ttl of second packet
526+ * @second_ttvn: tt version number of second included packet
526527 * @second_dest: second receiver of this coded packet
527528 * @second_source: original source of second included packet
528529 * @second_orig_dest: original destination of second included packet
529530 * @second_crc: checksum of second included packet
530− * @second_ttvn: tt version number of second included packet
531531 * @coded_len: length of network coded part of the payload
532532 */
533533 struct batadv_coded_packet {
@@ -554,8 +554,8 @@ struct batadv_coded_packet { · 20 unmodified lines
554554 * @version: batman-adv protocol version, part of the general header
555555 * @ttl: time to live for this packet, part of the general header
556556 * @reserved: reserved field (for packet alignment)
557− * @src: address of the source
558557 * @dst: address of the destination
558+ * @src: address of the source
559559 * @tvlv_len: length of tvlv data following the unicast tvlv header
560560 * @align: 2 bytes to align the header to a 4 byte boundary
561561 */