2008-10-29 08:43:58

by Holger Schurig

Subject: [PATCH] wireless: fix two bad print_ssid conversions

This patch fixes two current compilation problems. They showed up
with CONFIG_IEEE80211_DEBUG defined.

Signed-off-by: Holger Schurig <[email protected]>

Index: linux-wl/net/ieee80211/ieee80211_rx.c
===================================================================
--- linux-wl.orig/net/ieee80211/ieee80211_rx.c 2008-10-29 08:22:20.000000000 +0100
+++ linux-wl/net/ieee80211/ieee80211_rx.c 2008-10-29 08:34:21.000000000 +0100
@@ -1178,7 +1178,7 @@ static int ieee80211_parse_info_param(st

IEEE80211_DEBUG_MGMT("MFIE_TYPE_SSID: '%s' len=%d.\n",
print_ssid(ssid, network->ssid,
- network->ssid_len);
+ network->ssid_len),
network->ssid_len);
break;

Index: linux-wl/net/ieee80211/ieee80211_wx.c
===================================================================
--- linux-wl.orig/net/ieee80211/ieee80211_wx.c 2008-10-29 08:22:20.000000000 +0100
+++ linux-wl/net/ieee80211/ieee80211_wx.c 2008-10-29 08:36:07.000000000 +0100
@@ -399,6 +399,10 @@ int ieee80211_wx_set_encode(struct ieee8

/* If a new key was provided, set it up */
if (erq->length > 0) {
+#ifdef CONFIG_IEEE80211_DEBUG
+ DECLARE_SSID_BUF(ssid);
+#endif
+
len = erq->length <= 5 ? 5 : 13;
memcpy(sec.keys[key], keybuf, erq->length);
if (len > erq->length)

2008-10-29 12:57:20

by John W. Linville

Subject: Re: [PATCH] wireless: fix two bad print_ssid conversions

On Wed, Oct 29, 2008 at 09:43:50AM +0100, Holger Schurig wrote:
> This patch fixes two current compilation problems. They showed up
> with CONFIG_IEEE80211_DEBUG defined.
>
> Signed-off-by: Holger Schurig <[email protected]>

Cool, thanks!

John
--
John W. Linville Linux should be at the core
[email protected] of your literate lifestyle.