linux integration; annotated tag, v3.4-rc5, created. v3.4-rc5
by postmaster＠open-mesh.org
The annotated tag, v3.4-rc5 has been created
at c3bf00ad560c0ccf0e6a36d922cc99e9de10fb47 (tag)
tagging 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (commit)
replaces v3.4-rc4
tagged by Linus Torvalds
on Sun Apr 29 15:19:23 2012 -0700
- Shortlog ------------------------------------------------------------
Linux 3.4-rc5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iQEcBAABAgAGBQJPnb50AAoJEHm+PkMAQRiGAE0H/A4zFZIUGmF3miKPDYmejmrZ
oVDYxVAu6JHjHWhu8E3VsinvyVscowjV8dr15eSaQzmDmRkSHAnUQ+dB7Di7jLC2
MNopxsWjwyZ8zvvr3rFR76kjbWKk/1GYytnf7GPZLbJQzd51om2V/TY/6qkwiDSX
U8Tt7ihSgHAezefqEmWp2X/1pxDCEt+VFyn9vWpkhgdfM1iuzF39MbxSZAgqDQ/9
JJrBHFXhArqJguhENwL7OdDzkYqkdzlGtS0xgeY7qio2CzSXxZXK4svT6FFGA8Za
xlAaIvzslDniv3vR2ZKd6wzUwFHuynX222hNim3QMaYdXm012M+Nn1ufKYGFxI0=
=4d4w
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
8 years, 5 months
linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-for-davem has been updated
to ad1c8b0817e002e9901b44be822a90251713fadb (tag)
from 9cff54f5faa705b3a85107b135c52581d592e940 (which is now obsolete)
tagging 3ad345e2521ef41500cc0890a717656b975c4321 (commit)
replaces v3.4-rc4
tagged by Antonio Quartulli
on Sun Apr 29 10:50:34 2012 +0200
- Shortlog ------------------------------------------------------------
Included changes:
* a new feature has been introduced: D.A.T. (Distributed ARP Table). It is a
mechanism based on DHT theory that creates a distributed (mesh network wide)
ARP cache in order to speed up ARP resolutions in sparse wireless mesh
networks.
* in order to satisfy DAT requirements a new unicast packet type, namely
UNICAST_4ADDR, has been introduced. Backward compatibility has been kept: not
updated nodes will simply drop the packet and ignore DAT mechanism.
* minor fixes and cleanups
* minor routing protocol API cleanups
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQEcBAABAgAGBQJPnQDfAAoJEFMQTLzJFOZFSRwIAJn4hakgDbRiCwQcWYTbevOH
XWeaqdaXFPlXQ+KlTXaLHyXGGniE3zsDWLH0ZBD5Cz0DiAdmK6brutkvzijcFeq7
ojQUluCTd8I8Cbwu89/f+Z8xGlZn7xtoDl9h4Vs3LWDVCptImYhiWaQR2YGllA66
ziwZ1vmWcCepjf4qfgueI4oeMYhDpdA/0AukAFkvH9YYeBksUfSk9fNMskfsEUtk
nhDO8PTDrpwffhuIdCxl4+0ronh//ipVWkYwXAI/TJbhSPZWv8jTIS8hTly6UEev
B0Bn+Xk72S10yinm8RCbrLRxsA6RYFitQGKE8yR6yJuXTIUy77MteBhLFqEQOpk=
=P9BD
-----END PGP SIGNATURE-----
Antonio Quartulli (16):
batman-adv: clean up Kconfig
batman-adv: use ETH_ALEN instead of hardcoded numeric constants
batman-adv: convert the tt_crc to network order
batman-adv: remove duplicated line in comment
batman-adv: use ETH_HLEN instead of sizeof(struct ethhdr)
batman-adv: print OGM seq numbers as unsigned int
batman-adv: skip the window protection test when the originator has no neighbours
batman-adv: add UNICAST_4ADDR packet type
batman-adv: add a new log level for DAT debugging
batman-adv: add biggest_unsigned_int(x) macro
batman-adv: Distributed ARP Table - create DHT helper functions
batman-adv: Distributed ARP Table - add ARP parsing functions
batman-adv: Distributed ARP Table - add snooping functions for ARP messages
batman-adv: Distributed ARP Table - increase default soft_iface ARP table timeout
batman-adv: Distributed ARP Table - add compile option
batman-adv: fix wrong dhcp option list browsing
Eric Dumazet (1):
net: cleanup unsigned to unsigned int
Marek Lindner (15):
batman-adv: encourage batman to take shorter routes by changing the default hop penalty
batman-adv: move ogm initialization into the proper function
batman-adv: refactoring API: find generalized name for bat_ogm_init callback
batman-adv: randomize initial seqno to avoid collision
batman-adv: add iface_disable() callback to routing API
batman-adv: handle routing code initialization properly
batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback
batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN
batman-adv: mark existing ogm variables as batman iv
batman-adv: introduce is_single_hop_neigh variable to increase readability
batman-adv: introduce packet type handler array for incoming packets
batman-adv: register batman ogm receive function during protocol init
batman-adv: rename last_valid to last_seen
batman-adv: replace HZ calculations with jiffies_to_msecs()
batman-adv: split neigh_new function into generic and batman iv specific parts
Simon Wunderlich (10):
batman-adv: remove old bridge loop avoidance code
batman-adv: add basic bridge loop avoidance code
batman-adv: make bridge loop avoidance switchable
batman-adv: export claim tables through debugfs
batman-adv: allow multiple entries in tt_global_entries
batman-adv: don't let backbone gateways exchange tt entries
batman-adv: add broadcast duplicate check
batman-adv: drop STP over batman
batman-adv: form groups in the bridge loop avoidance
batman-adv: add bridge loop avoidance compile option
Sven Eckelmann (2):
batman-adv: Replace bitarray operations with bitmap
batman-adv: Remove declaration of only locally used functions
-----------------------------------------------------------------------
--
linux integration
8 years, 5 months
linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-for-davem has been updated
to 9cff54f5faa705b3a85107b135c52581d592e940 (tag)
from d647f539dc1a7ab3db0d278776cc66e2ec26d130 (which is now obsolete)
tagging 21cbd9f27c65fc2a41ea547af3b9eb9eda6a7a8f (commit)
replaces v3.4-rc4
tagged by Antonio Quartulli
on Sun Apr 29 10:43:39 2012 +0200
- Shortlog ------------------------------------------------------------
Included changes:
* a new feature has been introduced: D.A.T. (Distributed ARP Table). It is a
mechanism based on DHT theory that creates a distributed (mesh network wide)
ARP cache in order to speed up ARP resolutions in sparse wireless mesh
networks.
* in order to satisfy DAT requirements a new unicast packet type, namely
UNICAST_4ADDR, has been introduced. Backward compatibility has been kept: not
updated nodes will simply drop the packet and ignore DAT mechanism.
* minor fixes and cleanups
* minor routing protocol API cleanups
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQEcBAABAgAGBQJPnP9BAAoJEFMQTLzJFOZF7c4H/1UzF+RetL8WaMyH5Ogn4fNl
MLd0H3qIMHmTS+UhmDvuFMDyy0V6P7Pna7z7gdZ5O9nk6hdAwgvIqIT8rfaF5YXG
7yXnUnS05VhI/x7daCnVMpdSkXHzCnI9w/sytMHHOGhFY4hosk7Jsqw4MFchz/yq
uS7v1WhSIN0PcnLQL1GrLlzz9Vz6ozYHquoRML6dNr9in1a8Xd3NMX/mYAhvAqlQ
vV+/c053cFioBfDtpMoJfSpboTKdRkEgOk4dUULrmeae31+84FVykmrSCzifzaCr
gtLOmyilgnpwMWKZa6WgJ5VX/kVnMMtGic+oPimPnpcP7KMYx3ZR9/GmjsOkn4E=
=WfkI
-----END PGP SIGNATURE-----
Antonio Quartulli (17):
batman-adv: clean up Kconfig
batman-adv: use ETH_ALEN instead of hardcoded numeric constants
batman-adv: convert the tt_crc to network order
batman-adv: remove duplicated line in comment
batman-adv: use ETH_HLEN instead of sizeof(struct ethhdr)
batman-adv: print OGM seq numbers as unsigned int
batman-adv: skip the window protection test when the originator has no neighbours
batman-adv: add UNICAST_4ADDR packet type
batman-adv: add a new log level for DAT debugging
batman-adv: add biggest_unsigned_int(x) macro
batman-adv: Distributed ARP Table - create DHT helper functions
batman-adv: remove biggest_unsigned_int() macro
batman-adv: Distributed ARP Table - add ARP parsing functions
batman-adv: Distributed ARP Table - add snooping functions for ARP messages
batman-adv: Distributed ARP Table - increase default soft_iface ARP table timeout
batman-adv: Distributed ARP Table - add compile option
batman-adv: fix wrong dhcp option list browsing
Eric Dumazet (1):
net: cleanup unsigned to unsigned int
Marek Lindner (15):
batman-adv: encourage batman to take shorter routes by changing the default hop penalty
batman-adv: move ogm initialization into the proper function
batman-adv: refactoring API: find generalized name for bat_ogm_init callback
batman-adv: randomize initial seqno to avoid collision
batman-adv: add iface_disable() callback to routing API
batman-adv: handle routing code initialization properly
batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback
batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN
batman-adv: mark existing ogm variables as batman iv
batman-adv: introduce is_single_hop_neigh variable to increase readability
batman-adv: introduce packet type handler array for incoming packets
batman-adv: register batman ogm receive function during protocol init
batman-adv: rename last_valid to last_seen
batman-adv: replace HZ calculations with jiffies_to_msecs()
batman-adv: split neigh_new function into generic and batman iv specific parts
Simon Wunderlich (10):
batman-adv: remove old bridge loop avoidance code
batman-adv: add basic bridge loop avoidance code
batman-adv: make bridge loop avoidance switchable
batman-adv: export claim tables through debugfs
batman-adv: allow multiple entries in tt_global_entries
batman-adv: don't let backbone gateways exchange tt entries
batman-adv: add broadcast duplicate check
batman-adv: drop STP over batman
batman-adv: form groups in the bridge loop avoidance
batman-adv: add bridge loop avoidance compile option
Sven Eckelmann (2):
batman-adv: Replace bitarray operations with bitmap
batman-adv: Remove declaration of only locally used functions
-----------------------------------------------------------------------
--
linux integration
8 years, 5 months
linux integration; branch, merge/master, updated. v3.4-rc1-1908-ga6d3936
by postmaster＠open-mesh.org
The following commit has been merged in the merge/master branch:
commit a6d3936843b7050528117ab14a3de7a67de48bfa
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Sat Apr 28 21:21:15 2012 +0200
batman-adv: remove biggest_unsigned_int() macro
As suggested by David S. Miller, this macro is not very useful. So we can remove
it and use its expanded version instead.
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h
index 5e23577..6c0acde 100644
--- a/net/batman-adv/distributed-arp-table.h
+++ b/net/batman-adv/distributed-arp-table.h
@@ -29,7 +29,7 @@
#include <linux/if_arp.h>
-#define DAT_ADDR_MAX biggest_unsigned_int(dat_addr_t)
+#define DAT_ADDR_MAX ((dat_addr_t)~(dat_addr_t)0)
#define ARP_HW_SRC(skb, hdr_size) ((uint8_t *)(skb->data + hdr_size) + \
ETH_HLEN + sizeof(struct arphdr))
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 5fced65..4d0326a 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -239,9 +239,6 @@ static inline bool has_timed_out(unsigned long timestamp, unsigned int timeout)
/* Returns the smallest signed integer in two's complement with the sizeof x */
#define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u)))
-/* Returns the biggest unsigned integer with the sizeof x */
-#define biggest_unsigned_int(x) (~(x)0)
-
/* Checks if a sequence number x is a predecessor/successor of y.
* they handle overflows/underflows and can correctly check for a
* predecessor/successor unless the variable sequence number has grown by
--
linux integration
8 years, 5 months
batman-adv; branch, next, updated. v2012.1.0-90-g832de22
by postmaster＠open-mesh.org
The following commit has been merged in the next branch:
commit 832de22833248409585cf143cfdd16c80b74d04b
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Sat Apr 28 21:31:13 2012 +0200
batman-adv: remove biggest_unsigned_int() macro
As suggested by David S. Miller, this macro is not very useful. So we can remove
it and use its expanded version instead.
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
diff --git a/distributed-arp-table.h b/distributed-arp-table.h
index 5e23577..6c0acde 100644
--- a/distributed-arp-table.h
+++ b/distributed-arp-table.h
@@ -29,7 +29,7 @@
#include <linux/if_arp.h>
-#define DAT_ADDR_MAX biggest_unsigned_int(dat_addr_t)
+#define DAT_ADDR_MAX ((dat_addr_t)~(dat_addr_t)0)
#define ARP_HW_SRC(skb, hdr_size) ((uint8_t *)(skb->data + hdr_size) + \
ETH_HLEN + sizeof(struct arphdr))
diff --git a/main.h b/main.h
index 97d0258..426a0d5 100644
--- a/main.h
+++ b/main.h
@@ -241,9 +241,6 @@ static inline bool has_timed_out(unsigned long timestamp, unsigned int timeout)
/* Returns the smallest signed integer in two's complement with the sizeof x */
#define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u)))
-/* Returns the biggest unsigned integer with the sizeof x */
-#define biggest_unsigned_int(x) (~(x)0)
-
/* Checks if a sequence number x is a predecessor/successor of y.
* they handle overflows/underflows and can correctly check for a
* predecessor/successor unless the variable sequence number has grown by
--
batman-adv
8 years, 5 months
batman-adv; branch, master, updated. v2012.1.0-108-g8237b11
by postmaster＠open-mesh.org
The following commit has been merged in the master branch:
commit 8237b119981c9d7c01029b1a8fe90c04fad5459d
Author: Martin Hundebøll <martin(a)hundeboll.net>
Date: Wed Apr 25 15:30:49 2012 +0200
batman-adv: Define attribute __percpu for < 2.6.33
Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net>
diff --git a/compat.h b/compat.h
index 2dc41b1..33c52d3 100644
--- a/compat.h
+++ b/compat.h
@@ -59,6 +59,7 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
#define __always_unused __attribute__((unused))
+#define __percpu
#define skb_iif iif
--
batman-adv
8 years, 6 months
linux integration; branch, merge/master, updated. v3.4-rc1-1907-g3f1a86a
by postmaster＠open-mesh.org
The following commit has been merged in the merge/master branch:
commit 3f1a86adf26b1d6d1b1f0bbdc74b2a69c9659c61
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Wed Apr 25 15:30:13 2012 +0200
batman-adv: use real error codes instead of meaningless -1
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index ab2085c..2a1845e 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -59,7 +59,7 @@ static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)
{
struct batman_ogm_packet *batman_ogm_packet;
uint32_t random_seqno;
- int res = -1;
+ int res = -ENOMEM;
/* randomize initial seqno to avoid collision */
get_random_bytes(&random_seqno, sizeof(random_seqno));
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index e647a43..843caa7 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -309,10 +309,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
bat_priv = netdev_priv(hard_iface->soft_iface);
ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface);
- if (ret < 0) {
- ret = -ENOMEM;
+ if (ret < 0)
goto err_dev;
- }
hard_iface->if_num = bat_priv->num_ifaces;
bat_priv->num_ifaces++;
--
linux integration
8 years, 6 months
batctl; branch, master, updated. v2012.1.0-22-g8954b88
by postmaster＠open-mesh.org
The following commit has been merged in the master branch:
commit 8954b88b4cd35aa0101ace63aaf12a6e26fc8a96
Author: Al Viro <viro(a)ZenIV.linux.org.uk>
Date: Sun Apr 22 07:46:29 2012 +0100
batman-adv: keep batman_ogm_packet ->seqno net-endian all along
Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk>
diff --git a/packet.h b/packet.h
index 1df6210..f39556b 100644
--- a/packet.h
+++ b/packet.h
@@ -125,7 +125,7 @@ struct batman_header {
struct batman_ogm_packet {
struct batman_header header;
uint8_t flags; /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
- uint32_t seqno;
+ __be32 seqno;
uint8_t orig[ETH_ALEN];
uint8_t prev_sender[ETH_ALEN];
uint8_t gw_flags; /* flags related to gateway class */
--
batctl
8 years, 6 months
batman-adv; branch, master, updated. v2012.1.0-107-ge62e464
by postmaster＠open-mesh.org
The following commit has been merged in the master branch:
commit e62e4647f4bcae96ebf7eb887dba2d8410d9414f
Author: Al Viro <viro(a)ZenIV.linux.org.uk>
Date: Sun Apr 22 07:46:29 2012 +0100
batman-adv: keep batman_ogm_packet ->seqno net-endian all along
Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk>
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 2b48b82..8b3b77b 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -34,11 +34,11 @@ static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface,
const uint8_t *neigh_addr,
struct orig_node *orig_node,
struct orig_node *orig_neigh,
- uint32_t seqno)
+ __be32 seqno)
{
struct neigh_node *neigh_node;
- neigh_node = neigh_node_new(hard_iface, neigh_addr, seqno);
+ neigh_node = neigh_node_new(hard_iface, neigh_addr, ntohl(seqno));
if (!neigh_node)
goto out;
@@ -547,7 +547,6 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node,
"Forwarding packet: tq: %i, ttl: %i\n",
batman_ogm_packet->tq, batman_ogm_packet->header.ttl);
- batman_ogm_packet->seqno = htonl(batman_ogm_packet->seqno);
batman_ogm_packet->tt_crc = htons(batman_ogm_packet->tt_crc);
/* switch of primaries first hop flag when forwarding */
@@ -872,13 +871,14 @@ static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
int32_t seq_diff;
int need_update = 0;
int set_mark, ret = -1;
+ uint32_t seqno = ntohl(batman_ogm_packet->seqno);
orig_node = get_orig_node(bat_priv, batman_ogm_packet->orig);
if (!orig_node)
return 0;
spin_lock_bh(&orig_node->ogm_cnt_lock);
- seq_diff = batman_ogm_packet->seqno - orig_node->last_real_seqno;
+ seq_diff = seqno - orig_node->last_real_seqno;
/* signalize caller that the packet is to be dropped. */
if (!hlist_empty(&orig_node->neigh_list) &&
@@ -892,7 +892,7 @@ static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
is_duplicate |= bat_test_bit(tmp_neigh_node->real_bits,
orig_node->last_real_seqno,
- batman_ogm_packet->seqno);
+ seqno);
if (compare_eth(tmp_neigh_node->addr, ethhdr->h_source) &&
(tmp_neigh_node->if_incoming == if_incoming))
@@ -914,8 +914,8 @@ static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
if (need_update) {
bat_dbg(DBG_BATMAN, bat_priv,
"updating last_seqno: old %u, new %u\n",
- orig_node->last_real_seqno, batman_ogm_packet->seqno);
- orig_node->last_real_seqno = batman_ogm_packet->seqno;
+ orig_node->last_real_seqno, seqno);
+ orig_node->last_real_seqno = seqno;
}
ret = is_duplicate;
@@ -971,7 +971,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
"Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n",
ethhdr->h_source, if_incoming->net_dev->name,
if_incoming->net_dev->dev_addr, batman_ogm_packet->orig,
- batman_ogm_packet->prev_sender, batman_ogm_packet->seqno,
+ batman_ogm_packet->prev_sender, ntohl(batman_ogm_packet->seqno),
batman_ogm_packet->ttvn, batman_ogm_packet->tt_crc,
batman_ogm_packet->tt_num_changes, batman_ogm_packet->tq,
batman_ogm_packet->header.ttl,
@@ -1043,7 +1043,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
word = &(orig_neigh_node->bcast_own[offset]);
bat_set_bit(word,
if_incoming_seqno -
- batman_ogm_packet->seqno - 2);
+ ntohl(batman_ogm_packet->seqno) - 2);
orig_neigh_node->bcast_own_sum[if_incoming->if_num] =
bitmap_weight(word, TQ_LOCAL_WINDOW_SIZE);
spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock);
@@ -1136,7 +1136,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
* seqno and similar ttl as the non-duplicate */
if (is_bidirectional &&
(!is_duplicate ||
- ((orig_node->last_real_seqno == batman_ogm_packet->seqno) &&
+ ((orig_node->last_real_seqno == ntohl(batman_ogm_packet->seqno)) &&
(orig_node->last_ttl - 3 <= batman_ogm_packet->header.ttl))))
bat_iv_ogm_orig_update(bat_priv, orig_node, ethhdr,
batman_ogm_packet, if_incoming,
@@ -1219,7 +1219,6 @@ static int bat_iv_ogm_receive(struct sk_buff *skb,
do {
/* network to host order for our 32bit seqno and the
orig_interval */
- batman_ogm_packet->seqno = ntohl(batman_ogm_packet->seqno);
batman_ogm_packet->tt_crc = ntohs(batman_ogm_packet->tt_crc);
tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN;
diff --git a/packet.h b/packet.h
index 1df6210..f39556b 100644
--- a/packet.h
+++ b/packet.h
@@ -125,7 +125,7 @@ struct batman_header {
struct batman_ogm_packet {
struct batman_header header;
uint8_t flags; /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
- uint32_t seqno;
+ __be32 seqno;
uint8_t orig[ETH_ALEN];
uint8_t prev_sender[ETH_ALEN];
uint8_t gw_flags; /* flags related to gateway class */
--
batman-adv
8 years, 6 months
batctl; branch, master, updated. v2012.1.0-21-g503e03d
by postmaster＠open-mesh.org
The following commit has been merged in the master branch:
commit 503e03d9bcca0341abb7297fb3c249666e5f2522
Author: Al Viro <viro(a)ZenIV.linux.org.uk>
Date: Sun Apr 22 07:47:50 2012 +0100
batman-adv: trivial endianness annotations
Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk>
diff --git a/packet.h b/packet.h
index 307dbb3..1df6210 100644
--- a/packet.h
+++ b/packet.h
@@ -113,7 +113,7 @@ enum bla_claimframe {
struct bla_claim_dst {
uint8_t magic[3]; /* FF:43:05 */
uint8_t type; /* bla_claimframe */
- uint16_t group; /* group id */
+ __be16 group; /* group id */
} __packed;
struct batman_header {
@@ -142,7 +142,7 @@ struct icmp_packet {
uint8_t msg_type; /* see ICMP message types above */
uint8_t dst[ETH_ALEN];
uint8_t orig[ETH_ALEN];
- uint16_t seqno;
+ __be16 seqno;
uint8_t uid;
uint8_t reserved;
} __packed;
@@ -156,7 +156,7 @@ struct icmp_packet_rr {
uint8_t msg_type; /* see ICMP message types above */
uint8_t dst[ETH_ALEN];
uint8_t orig[ETH_ALEN];
- uint16_t seqno;
+ __be16 seqno;
uint8_t uid;
uint8_t rr_cur;
uint8_t rr[BAT_RR_LEN][ETH_ALEN];
@@ -181,20 +181,20 @@ struct unicast_frag_packet {
uint8_t flags;
uint8_t align;
uint8_t orig[ETH_ALEN];
- uint16_t seqno;
+ __be16 seqno;
} __packed;
struct bcast_packet {
struct batman_header header;
uint8_t reserved;
- uint32_t seqno;
+ __be32 seqno;
uint8_t orig[ETH_ALEN];
} __packed;
struct vis_packet {
struct batman_header header;
uint8_t vis_type; /* which type of vis-participant sent this? */
- uint32_t seqno; /* sequence number */
+ __be32 seqno; /* sequence number */
uint8_t entries; /* number of entries behind this struct */
uint8_t reserved;
uint8_t vis_orig[ETH_ALEN]; /* originator reporting its neighbors */
--
batctl
8 years, 6 months