Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - update mailing list URL, by Sven Eckelmann - fix typos and grammar in documentation, by Sven Eckelmann - introduce a configurable per interface hop penalty, by Linus Luessing ====================
Showing the changes to include/uapi/linux (2 of 24 files). Show all
Unified · Split
| @@ -72,8 +72,8 @@ enum batadv_subtype { · 71 unmodified lines | ||
| 72 | 72 | |
| 73 | 73 | /** |
| 74 | 74 | * enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets |
| 75 | − * @BATADV_NOT_BEST_NEXT_HOP: flag is set when ogm packet is forwarded and was | |
| 76 | − * previously received from someone else than the best neighbor. | |
| 75 | + * @BATADV_NOT_BEST_NEXT_HOP: flag is set when the ogm packet is forwarded and | |
| 76 | + * was previously received from someone other than the best neighbor. | |
| 77 | 77 | * @BATADV_PRIMARIES_FIRST_HOP: flag unused. |
| 78 | 78 | * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a |
| 79 | 79 | * one hop neighbor on the interface where it was originally received. |
| @@ -195,8 +195,8 @@ struct batadv_bla_claim_dst { · 115 unmodified lines | ||
| 195 | 195 | /** |
| 196 | 196 | * struct batadv_ogm_packet - ogm (routing protocol) packet |
| 197 | 197 | * @packet_type: batman-adv packet type, part of the general header |
| 198 | − * @version: batman-adv protocol version, part of the genereal header | |
| 199 | − * @ttl: time to live for this packet, part of the genereal header | |
| 198 | + * @version: batman-adv protocol version, part of the general header | |
| 199 | + * @ttl: time to live for this packet, part of the general header | |
| 200 | 200 | * @flags: contains routing relevant flags - see enum batadv_iv_flags |
| 201 | 201 | * @seqno: sequence identification |
| 202 | 202 | * @orig: address of the source node |
| @@ -247,7 +247,7 @@ struct batadv_ogm2_packet { · 44 unmodified lines | ||
| 247 | 247 | /** |
| 248 | 248 | * struct batadv_elp_packet - elp (neighbor discovery) packet |
| 249 | 249 | * @packet_type: batman-adv packet type, part of the general header |
| 250 | − * @version: batman-adv protocol version, part of the genereal header | |
| 250 | + * @version: batman-adv protocol version, part of the general header | |
| 251 | 251 | * @orig: originator mac address |
| 252 | 252 | * @seqno: sequence number |
| 253 | 253 | * @elp_interval: currently used ELP sending interval in ms |
| @@ -265,15 +265,15 @@ struct batadv_elp_packet { · 11 unmodified lines | ||
| 265 | 265 | /** |
| 266 | 266 | * struct batadv_icmp_header - common members among all the ICMP packets |
| 267 | 267 | * @packet_type: batman-adv packet type, part of the general header |
| 268 | − * @version: batman-adv protocol version, part of the genereal header | |
| 269 | − * @ttl: time to live for this packet, part of the genereal header | |
| 268 | + * @version: batman-adv protocol version, part of the general header | |
| 269 | + * @ttl: time to live for this packet, part of the general header | |
| 270 | 270 | * @msg_type: ICMP packet type |
| 271 | 271 | * @dst: address of the destination node |
| 272 | 272 | * @orig: address of the source node |
| 273 | 273 | * @uid: local ICMP socket identifier |
| 274 | 274 | * @align: not used - useful for alignment purposes only |
| 275 | 275 | * |
| 276 | − * This structure is used for ICMP packets parsing only and it is never sent | |
| 276 | + * This structure is used for ICMP packet parsing only and it is never sent | |
| 277 | 277 | * over the wire. The alignment field at the end is there to ensure that |
| 278 | 278 | * members are padded the same way as they are in real packets. |
| 279 | 279 | */ |
| @@ -291,8 +291,8 @@ struct batadv_icmp_header { · 11 unmodified lines | ||
| 291 | 291 | /** |
| 292 | 292 | * struct batadv_icmp_packet - ICMP packet |
| 293 | 293 | * @packet_type: batman-adv packet type, part of the general header |
| 294 | − * @version: batman-adv protocol version, part of the genereal header | |
| 295 | − * @ttl: time to live for this packet, part of the genereal header | |
| 294 | + * @version: batman-adv protocol version, part of the general header | |
| 295 | + * @ttl: time to live for this packet, part of the general header | |
| 296 | 296 | * @msg_type: ICMP packet type |
| 297 | 297 | * @dst: address of the destination node |
| 298 | 298 | * @orig: address of the source node |
| @@ -315,8 +315,8 @@ struct batadv_icmp_packet { · 16 unmodified lines | ||
| 315 | 315 | /** |
| 316 | 316 | * struct batadv_icmp_tp_packet - ICMP TP Meter packet |
| 317 | 317 | * @packet_type: batman-adv packet type, part of the general header |
| 318 | − * @version: batman-adv protocol version, part of the genereal header | |
| 319 | − * @ttl: time to live for this packet, part of the genereal header | |
| 318 | + * @version: batman-adv protocol version, part of the general header | |
| 319 | + * @ttl: time to live for this packet, part of the general header | |
| 320 | 320 | * @msg_type: ICMP packet type |
| 321 | 321 | * @dst: address of the destination node |
| 322 | 322 | * @orig: address of the source node |
| @@ -358,8 +358,8 @@ enum batadv_icmp_tp_subtype { · 35 unmodified lines | ||
| 358 | 358 | /** |
| 359 | 359 | * struct batadv_icmp_packet_rr - ICMP RouteRecord packet |
| 360 | 360 | * @packet_type: batman-adv packet type, part of the general header |
| 361 | − * @version: batman-adv protocol version, part of the genereal header | |
| 362 | − * @ttl: time to live for this packet, part of the genereal header | |
| 361 | + * @version: batman-adv protocol version, part of the general header | |
| 362 | + * @ttl: time to live for this packet, part of the general header | |
| 363 | 363 | * @msg_type: ICMP packet type |
| 364 | 364 | * @dst: address of the destination node |
| 365 | 365 | * @orig: address of the source node |
| @@ -397,8 +397,8 @@ struct batadv_icmp_packet_rr { · 31 unmodified lines | ||
| 397 | 397 | /** |
| 398 | 398 | * struct batadv_unicast_packet - unicast packet for network payload |
| 399 | 399 | * @packet_type: batman-adv packet type, part of the general header |
| 400 | − * @version: batman-adv protocol version, part of the genereal header | |
| 401 | − * @ttl: time to live for this packet, part of the genereal header | |
| 400 | + * @version: batman-adv protocol version, part of the general header | |
| 401 | + * @ttl: time to live for this packet, part of the general header | |
| 402 | 402 | * @ttvn: translation table version number |
| 403 | 403 | * @dest: originator destination of the unicast packet |
| 404 | 404 | */ |
| @@ -433,8 +433,8 @@ struct batadv_unicast_4addr_packet { · 28 unmodified lines | ||
| 433 | 433 | /** |
| 434 | 434 | * struct batadv_frag_packet - fragmented packet |
| 435 | 435 | * @packet_type: batman-adv packet type, part of the general header |
| 436 | − * @version: batman-adv protocol version, part of the genereal header | |
| 437 | − * @ttl: time to live for this packet, part of the genereal header | |
| 436 | + * @version: batman-adv protocol version, part of the general header | |
| 437 | + * @ttl: time to live for this packet, part of the general header | |
| 438 | 438 | * @dest: final destination used when routing fragments |
| 439 | 439 | * @orig: originator of the fragment used when merging the packet |
| 440 | 440 | * @no: fragment number within this sequence |
| @@ -467,8 +467,8 @@ struct batadv_frag_packet { · 26 unmodified lines | ||
| 467 | 467 | /** |
| 468 | 468 | * struct batadv_bcast_packet - broadcast packet for network payload |
| 469 | 469 | * @packet_type: batman-adv packet type, part of the general header |
| 470 | − * @version: batman-adv protocol version, part of the genereal header | |
| 471 | − * @ttl: time to live for this packet, part of the genereal header | |
| 470 | + * @version: batman-adv protocol version, part of the general header | |
| 471 | + * @ttl: time to live for this packet, part of the general header | |
| 472 | 472 | * @reserved: reserved byte for alignment |
| 473 | 473 | * @seqno: sequence identification |
| 474 | 474 | * @orig: originator of the broadcast packet |
| @@ -488,10 +488,10 @@ struct batadv_bcast_packet { · 13 unmodified lines | ||
| 488 | 488 | /** |
| 489 | 489 | * struct batadv_coded_packet - network coded packet |
| 490 | 490 | * @packet_type: batman-adv packet type, part of the general header |
| 491 | − * @version: batman-adv protocol version, part of the genereal header | |
| 492 | − * @ttl: time to live for this packet, part of the genereal header | |
| 491 | + * @version: batman-adv protocol version, part of the general header | |
| 492 | + * @ttl: time to live for this packet, part of the general header | |
| 493 | 493 | * @first_source: original source of first included packet |
| 494 | − * @first_orig_dest: original destinal of first included packet | |
| 494 | + * @first_orig_dest: original destination of first included packet | |
| 495 | 495 | * @first_crc: checksum of first included packet |
| 496 | 496 | * @first_ttvn: tt-version number of first included packet |
| 497 | 497 | * @second_ttl: ttl of second packet |
| @@ -523,8 +523,8 @@ struct batadv_coded_packet { · 25 unmodified lines | ||
| 523 | 523 | /** |
| 524 | 524 | * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload |
| 525 | 525 | * @packet_type: batman-adv packet type, part of the general header |
| 526 | − * @version: batman-adv protocol version, part of the genereal header | |
| 527 | − * @ttl: time to live for this packet, part of the genereal header | |
| 526 | + * @version: batman-adv protocol version, part of the general header | |
| 527 | + * @ttl: time to live for this packet, part of the general header | |
| 528 | 528 | * @reserved: reserved field (for packet alignment) |
| 529 | 529 | * @src: address of the source |
| 530 | 530 | * @dst: address of the destination |
| @@ -69,7 +69,7 @@ enum batadv_tt_client_flags { · 68 unmodified lines | ||
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | 71 | * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be |
| 72 | − * part of the network but no nnode has already announced it | |
| 72 | + * part of the network but no node has already announced it | |
| 73 | 73 | */ |
| 74 | 74 | BATADV_TT_CLIENT_TEMP = (1 << 11), |
| 75 | 75 | }; |
| @@ -131,7 +131,7 @@ enum batadv_gw_modes { · 55 unmodified lines | ||
| 131 | 131 | /** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */ |
| 132 | 132 | BATADV_GW_MODE_CLIENT, |
| 133 | 133 | |
| 134 | − /** @BATADV_GW_MODE_SERVER: announce itself as gatway server */ | |
| 134 | + /** @BATADV_GW_MODE_SERVER: announce itself as gateway server */ | |
| 135 | 135 | BATADV_GW_MODE_SERVER, |
| 136 | 136 | }; |
| 137 | 137 | |
| @@ -427,7 +427,8 @@ enum batadv_nl_attrs { · 289 unmodified lines | ||
| 427 | 427 | |
| 428 | 428 | /** |
| 429 | 429 | * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied |
| 430 | − * to an originator message's tq-field on every hop. | |
| 430 | + * to an originator message's tq-field on every hop and/or per | |
| 431 | + * hard interface | |
| 431 | 432 | */ |
| 432 | 433 | BATADV_ATTR_HOP_PENALTY, |
| 433 | 434 | |