From e03382c14e630523d8da01b1eadbe2a8e6fbe453 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 22 Apr 2012 07:50:29 +0100 Subject: [PATCH] --- yaml --- r: 314303 b: refs/heads/master c: 1a5852d81a664e5a6456f82dff6f31b06dc2bede h: refs/heads/master i: 314301: 43d1086daaad54985d0a29b8a6b2e26a681c1fd3 314299: 96310ac47d9282b04e0128f17b3beec2ef009f9e 314295: 898e151cabb0a55d844d4e141bd023e6705d4a15 314287: 3c0c8697aafcfbf7b45d22174a5d3b6314d985ea 314271: 6e86f442864f084e2a03162f67d2b9e8a6a5b714 314239: af1c118ad6b8cf7270817733586d377fa325c624 v: v3 --- [refs] | 2 +- trunk/net/batman-adv/bridge_loop_avoidance.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3147b2df760b..ecd988a1e805 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08ad76ecc9f7f02cbe6ccbaa4abc9e9f193ed0e4 +refs/heads/master: 1a5852d81a664e5a6456f82dff6f31b06dc2bede diff --git a/trunk/net/batman-adv/bridge_loop_avoidance.c b/trunk/net/batman-adv/bridge_loop_avoidance.c index 5c1ac559edbb..89e2b1cda182 100644 --- a/trunk/net/batman-adv/bridge_loop_avoidance.c +++ b/trunk/net/batman-adv/bridge_loop_avoidance.c @@ -510,7 +510,7 @@ static void bla_send_announce(struct bat_priv *bat_priv, memcpy(mac, announce_mac, 4); crc = htons(backbone_gw->crc); - memcpy(&mac[4], (uint8_t *)&crc, 2); + memcpy(&mac[4], &crc, 2); bla_send_claim(bat_priv, mac, backbone_gw->vid, CLAIM_TYPE_ANNOUNCE);