The following commit has been merged in the master branch: commit 934b01f183d28b25a01dea8ba9deda2efafe309e Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Feb 6 13:46:11 2012 +0800

batman-adv: fix checkpatch complaints

Reggression introduced with 24a6289494bbb4d222cf9c043bdf105f55451048.

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/packet.h b/packet.h index 3496d38..45e75ed 100644 --- a/packet.h +++ b/packet.h @@ -165,9 +165,9 @@ struct vis_packet { uint32_t seqno; /* sequence number */ uint8_t entries; /* number of entries behind this struct */ uint8_t reserved; - uint8_t vis_orig[ETH_ALEN]; /* originator that announces its neighbors */ + uint8_t vis_orig[ETH_ALEN]; /* originator reporting its neighbors */ uint8_t target_orig[ETH_ALEN]; /* who should receive this packet */ - uint8_t sender_orig[ETH_ALEN]; /* who sent or rebroadcasted this packet */ + uint8_t sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */ } __packed;

struct tt_query_packet {