Simon Wunderlich says: ==================== This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - bump copyright years, by Sven Eckelmann - fix macro indendation for checkpatch, by Sven Eckelmann - fix comparison operator for bool returning functions, by Sven Eckelmann - assume 2-byte packet alignments for all packet types, by Matthias Schiffer ====================
Showing the changes to include/uapi/linux (2 of 61 files). Show all
Unified · Split
| @@ -1,5 +1,5 @@ | |||
| 1 | /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */ | 1 | /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */ |
| 2 | /* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: | 2 | /* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: |
| 3 | * | 3 | * |
| 4 | * Marek Lindner, Simon Wunderlich | 4 | * Marek Lindner, Simon Wunderlich |
| 5 | * | 5 | * |
| @@ -196,8 +196,6 @@ struct batadv_bla_claim_dst { · 190 unmodified lines | |||
| 196 | __be16 group; /* group id */ | 196 | __be16 group; /* group id */ |
| 197 | }; | 197 | }; |
| 198 | 198 | ||
| 199 | #pragma pack() | ||
| 200 | |||
| 201 | /** | 199 | /** |
| 202 | * struct batadv_ogm_packet - ogm (routing protocol) packet | 200 | * struct batadv_ogm_packet - ogm (routing protocol) packet |
| 203 | * @packet_type: batman-adv packet type, part of the general header | 201 | * @packet_type: batman-adv packet type, part of the general header |
| @@ -222,9 +220,6 @@ struct batadv_ogm_packet { · 18 unmodified lines | |||
| 222 | __u8 reserved; | 220 | __u8 reserved; |
| 223 | __u8 tq; | 221 | __u8 tq; |
| 224 | __be16 tvlv_len; | 222 | __be16 tvlv_len; |
| 225 | /* __packed is not needed as the struct size is divisible by 4, | ||
| 226 | * and the largest data type in this struct has a size of 4. | ||
| 227 | */ | ||
| 228 | }; | 223 | }; |
| 229 | 224 | ||
| 230 | #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) | 225 | #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) |
| @@ -249,9 +244,6 @@ struct batadv_ogm2_packet { · 18 unmodified lines | |||
| 249 | __u8 orig[ETH_ALEN]; | 244 | __u8 orig[ETH_ALEN]; |
| 250 | __be16 tvlv_len; | 245 | __be16 tvlv_len; |
| 251 | __be32 throughput; | 246 | __be32 throughput; |
| 252 | /* __packed is not needed as the struct size is divisible by 4, | ||
| 253 | * and the largest data type in this struct has a size of 4. | ||
| 254 | */ | ||
| 255 | }; | 247 | }; |
| 256 | 248 | ||
| 257 | #define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet) | 249 | #define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet) |
| @@ -405,7 +397,6 @@ struct batadv_icmp_packet_rr { · 147 unmodified lines | |||
| 405 | * misalignment of the payload after the ethernet header. It may also lead to | 397 | * misalignment of the payload after the ethernet header. It may also lead to |
| 406 | * leakage of information when the padding it not initialized before sending. | 398 | * leakage of information when the padding it not initialized before sending. |
| 407 | */ | 399 | */ |
| 408 | #pragma pack(2) | ||
| 409 | 400 | ||
| 410 | /** | 401 | /** |
| 411 | * struct batadv_unicast_packet - unicast packet for network payload | 402 | * struct batadv_unicast_packet - unicast packet for network payload |
| @@ -533,8 +524,6 @@ struct batadv_coded_packet { · 121 unmodified lines | |||
| 533 | __be16 coded_len; | 524 | __be16 coded_len; |
| 534 | }; | 525 | }; |
| 535 | 526 | ||
| 536 | #pragma pack() | ||
| 537 | |||
| 538 | /** | 527 | /** |
| 539 | * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload | 528 | * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload |
| 540 | * @packet_type: batman-adv packet type, part of the general header | 529 | * @packet_type: batman-adv packet type, part of the general header |
| @@ -641,4 +630,6 @@ struct batadv_tvlv_mcast_data { · 100 unmodified lines | |||
| 641 | __u8 reserved[3]; | 630 | __u8 reserved[3]; |
| 642 | }; | 631 | }; |
| 643 | 632 | ||
| 633 | #pragma pack() | ||
| 634 | |||
| 644 | #endif /* _UAPI_LINUX_BATADV_PACKET_H_ */ | 635 | #endif /* _UAPI_LINUX_BATADV_PACKET_H_ */ |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* SPDX-License-Identifier: MIT */ | 1 | /* SPDX-License-Identifier: MIT */ |
| 2 | /* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: | 2 | /* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors: |
| 3 | * | 3 | * |
| 4 | * Matthias Schiffer | 4 | * Matthias Schiffer |
| 5 | * | 5 | * |