]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
b43: Eliminate compilation warning in b43_op_set_key
authorLarry Finger <Larry.Finger@lwfinger.net>
Wed, 14 Jan 2009 17:15:25 +0000 (11:15 -0600)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jan 2009 21:00:28 +0000 (16:00 -0500)
A recent pull from wireless testing generates the following warning:

   CC [M]  drivers/net/wireless/b43/main.o
 drivers/net/wireless/b43/main.c: In function ‘b43_op_set_key’:
 drivers/net/wireless/b43/main.c:3636: warning: pointer type mismatch
 in conditional expression

This fix was suggested by Johannes Berg <johannes@sipsolutions.net>.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/main.c

index 19ad5164fce7914a4f7c6195edff8309bf14cf8a..8bb6659c0b3f858c0508c10df03b6a9261f62ddc 100644 (file)
@@ -3484,6 +3484,9 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
        u8 algorithm;
        u8 index;
        int err;
+#if B43_DEBUG
+       static const u8 bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+#endif
 
        if (modparam_nohwcrypt)
                return -ENOSPC; /* User disabled HW-crypto */
@@ -3582,7 +3585,7 @@ out_unlock:
                b43dbg(wl, "%s hardware based encryption for keyidx: %d, "
                       "mac: %pM\n",
                       cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
-                      sta ? sta->addr : "<group key>");
+                      sta ? sta->addr : bcast_addr);
                b43_dump_keymemory(dev);
        }
        write_unlock(&wl->tx_lock);