diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2009-01-14 18:15:25 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 22:00:28 +0100 |
| commit | a1d88210955e56f7a0d54ac72747075b683b0850 (patch) | |
| tree | 74dd0fb7928f37d3f5a7ad822003b0aa2318c02b | |
| parent | ath9k: Use a defined value for pci_set_power_state() (diff) | |
| download | linux-a1d88210955e56f7a0d54ac72747075b683b0850.tar.xz linux-a1d88210955e56f7a0d54ac72747075b683b0850.zip | |
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>
| -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, 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); |