diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2009-01-14 12:15:25 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:00:28 -0500 |
commit | a1d88210955e56f7a0d54ac72747075b683b0850 (patch) | |
tree | 74dd0fb7928f37d3f5a7ad822003b0aa2318c02b /drivers | |
parent | 07e74348c76368c3d694a06677c200dc8d9b00e8 (diff) |
b43: Eliminate compilation warning in b43_op_set_key
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 19ad5164fce7..8bb6659c0b3f 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -3484,6 +3484,9 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
3484 | u8 algorithm; | 3484 | u8 algorithm; |
3485 | u8 index; | 3485 | u8 index; |
3486 | int err; | 3486 | int err; |
3487 | #if B43_DEBUG | ||
3488 | static const u8 bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; | ||
3489 | #endif | ||
3487 | 3490 | ||
3488 | if (modparam_nohwcrypt) | 3491 | if (modparam_nohwcrypt) |
3489 | return -ENOSPC; /* User disabled HW-crypto */ | 3492 | return -ENOSPC; /* User disabled HW-crypto */ |
@@ -3582,7 +3585,7 @@ out_unlock: | |||
3582 | b43dbg(wl, "%s hardware based encryption for keyidx: %d, " | 3585 | b43dbg(wl, "%s hardware based encryption for keyidx: %d, " |
3583 | "mac: %pM\n", | 3586 | "mac: %pM\n", |
3584 | cmd == SET_KEY ? "Using" : "Disabling", key->keyidx, | 3587 | cmd == SET_KEY ? "Using" : "Disabling", key->keyidx, |
3585 | sta ? sta->addr : "<group key>"); | 3588 | sta ? sta->addr : bcast_addr); |
3586 | b43_dump_keymemory(dev); | 3589 | b43_dump_keymemory(dev); |
3587 | } | 3590 | } |
3588 | write_unlock(&wl->tx_lock); | 3591 | write_unlock(&wl->tx_lock); |