aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/bridge_loop_avoidance.c
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2012-04-22 02:47:50 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-18 12:01:01 -0400
commit3e2f1a1bb528df14065a9287f37378ca453c52f9 (patch)
tree54b3a801c31592330cc2795c30593d9a369dc798 /net/batman-adv/bridge_loop_avoidance.c
parent1a5852d81a664e5a6456f82dff6f31b06dc2bede (diff)
batman-adv: trivial endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/bridge_loop_avoidance.c')
-rw-r--r--net/batman-adv/bridge_loop_avoidance.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 89e2b1cda182..0355c48db282 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -258,7 +258,7 @@ static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac,
258 struct net_device *soft_iface; 258 struct net_device *soft_iface;
259 uint8_t *hw_src; 259 uint8_t *hw_src;
260 struct bla_claim_dst local_claim_dest; 260 struct bla_claim_dst local_claim_dest;
261 uint32_t zeroip = 0; 261 __be32 zeroip = 0;
262 262
263 primary_if = primary_if_get_selected(bat_priv); 263 primary_if = primary_if_get_selected(bat_priv);
264 if (!primary_if) 264 if (!primary_if)
@@ -506,7 +506,7 @@ static void bla_send_announce(struct bat_priv *bat_priv,
506 struct backbone_gw *backbone_gw) 506 struct backbone_gw *backbone_gw)
507{ 507{
508 uint8_t mac[ETH_ALEN]; 508 uint8_t mac[ETH_ALEN];
509 uint16_t crc; 509 __be16 crc;
510 510
511 memcpy(mac, announce_mac, 4); 511 memcpy(mac, announce_mac, 4);
512 crc = htons(backbone_gw->crc); 512 crc = htons(backbone_gw->crc);
@@ -627,7 +627,7 @@ static int handle_announce(struct bat_priv *bat_priv,
627 627
628 /* handle as ANNOUNCE frame */ 628 /* handle as ANNOUNCE frame */
629 backbone_gw->lasttime = jiffies; 629 backbone_gw->lasttime = jiffies;
630 crc = ntohs(*((uint16_t *)(&an_addr[4]))); 630 crc = ntohs(*((__be16 *)(&an_addr[4])));
631 631
632 bat_dbg(DBG_BLA, bat_priv, 632 bat_dbg(DBG_BLA, bat_priv,
633 "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %04x\n", 633 "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %04x\n",