* [PATCH V2] b43: Eliminate compilation warning in b43_op_set_key
@ 2009-01-14 17:15 Larry Finger
2009-01-14 17:30 ` Michael Buesch
0 siblings, 1 reply; 2+ messages in thread
From: Larry Finger @ 2009-01-14 17:15 UTC (permalink / raw)
To: John W Linville, Michael Buesch, Johannes Berg; +Cc: linux-wireless
A recent pull from wireless testing generates the following warning:
=20
CC [M] drivers/net/wireless/b43/main.o
drivers/net/wireless/b43/main.c: In function =E2=80=98b43_op_set_key=E2=
=80=99:
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>
---
Index: wireless-testing/drivers/net/wireless/b43/main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wireless-testing.orig/drivers/net/wireless/b43/main.c
+++ wireless-testing/drivers/net/wireless/b43/main.c
@@ -3535,6 +3535,9 @@ static int b43_op_set_key(struct ieee802
u8 algorithm;
u8 index;
int err;
+#if B43_DEBUG
+ static const u8 bcast_addr[ETH_ALEN] =3D {0xff, 0xff, 0xff, 0xff, 0xf=
f, 0xff};
+#endif
=20
if (modparam_nohwcrypt)
return -ENOSPC; /* User disabled HW-crypto */
@@ -3633,7 +3636,7 @@ out_unlock:
b43dbg(wl, "%s hardware based encryption for keyidx: %d, "
"mac: %pM\n",
cmd =3D=3D 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH V2] b43: Eliminate compilation warning in b43_op_set_key
2009-01-14 17:15 [PATCH V2] b43: Eliminate compilation warning in b43_op_set_key Larry Finger
@ 2009-01-14 17:30 ` Michael Buesch
0 siblings, 0 replies; 2+ messages in thread
From: Michael Buesch @ 2009-01-14 17:30 UTC (permalink / raw)
To: Larry Finger; +Cc: John W Linville, Johannes Berg, linux-wireless
On Wednesday 14 January 2009 18:15:25 Larry Finger wrote:
> A recent pull from wireless testing generates the following warning:
> =20
> CC [M] drivers/net/wireless/b43/main.o
> drivers/net/wireless/b43/main.c: In function =E2=80=98b43_op_set_key=
=E2=80=99:
> drivers/net/wireless/b43/main.c:3636: warning: pointer type mismatch
> in conditional expression
>=20
> This fix was suggested by Johannes Berg <johannes@sipsolutions.net>.
>=20
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
ACK
> ---
>=20
> Index: wireless-testing/drivers/net/wireless/b43/main.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- wireless-testing.orig/drivers/net/wireless/b43/main.c
> +++ wireless-testing/drivers/net/wireless/b43/main.c
> @@ -3535,6 +3535,9 @@ static int b43_op_set_key(struct ieee802
> u8 algorithm;
> u8 index;
> int err;
> +#if B43_DEBUG
> + static const u8 bcast_addr[ETH_ALEN] =3D {0xff, 0xff, 0xff, 0xff, 0=
xff, 0xff};
> +#endif
> =20
> if (modparam_nohwcrypt)
> return -ENOSPC; /* User disabled HW-crypto */
> @@ -3633,7 +3636,7 @@ out_unlock:
> b43dbg(wl, "%s hardware based encryption for keyidx: %d, "
> "mac: %pM\n",
> cmd =3D=3D 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);
>=20
>=20
--=20
Greetings, Michael.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-14 17:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-14 17:15 [PATCH V2] b43: Eliminate compilation warning in b43_op_set_key Larry Finger
2009-01-14 17:30 ` Michael Buesch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).