Message ID | 1253146059-4169-1-git-send-email-plagnioj@jcrosoft.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, Sep 17, 2009 at 02:07:38AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > drivers/net/wireless/wl12xx/wl1271_main.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c > index d9169b4..f6f8895 100644 > --- a/drivers/net/wireless/wl12xx/wl1271_main.c > +++ b/drivers/net/wireless/wl12xx/wl1271_main.c > @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw, > { > struct wl1271 *wl = hw->priv; > struct sk_buff *beacon; > - DECLARE_MAC_BUF(mac); > int ret; > > wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s", > - print_mac(mac, conf->bssid)); > + printf("%pM", conf->bssid); > wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid, > conf->ssid_len); > ACK
On Thu, 2009-09-17 at 02:07 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > drivers/net/wireless/wl12xx/wl1271_main.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c > index d9169b4..f6f8895 100644 > --- a/drivers/net/wireless/wl12xx/wl1271_main.c > +++ b/drivers/net/wireless/wl12xx/wl1271_main.c > @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw, > { > struct wl1271 *wl = hw->priv; > struct sk_buff *beacon; > - DECLARE_MAC_BUF(mac); > int ret; > > wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s", > - print_mac(mac, conf->bssid)); > + printf("%pM", conf->bssid); > wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid, > conf->ssid_len); > That isn't even syntactically valid, let alone correct. Ben.
From: "John W. Linville" <linville@tuxdriver.com> Date: Wed, 16 Sep 2009 20:28:52 -0400 > On Thu, Sep 17, 2009 at 02:07:38AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> ... > > ACK Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Sep 17, 2009 at 02:22:51AM +0100, Ben Hutchings wrote: > On Thu, 2009-09-17 at 02:07 +0200, Jean-Christophe PLAGNIOL-VILLARD > wrote: > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > --- > > drivers/net/wireless/wl12xx/wl1271_main.c | 3 +-- > > 1 files changed, 1 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c > > index d9169b4..f6f8895 100644 > > --- a/drivers/net/wireless/wl12xx/wl1271_main.c > > +++ b/drivers/net/wireless/wl12xx/wl1271_main.c > > @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw, > > { > > struct wl1271 *wl = hw->priv; > > struct sk_buff *beacon; > > - DECLARE_MAC_BUF(mac); > > int ret; > > > > wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s", > > - print_mac(mac, conf->bssid)); > > + printf("%pM", conf->bssid); > > wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid, > > conf->ssid_len); > > > > That isn't even syntactically valid, let alone correct. Ugh, you're right -- remind me not to ACK things before bed... Jean-Christophe posted a new patch that looked better, although it probably needs to be rebased on this one since I think Dave applied it after my (misguided) ACK. John
On 08:55 Thu 17 Sep , John W. Linville wrote: > On Thu, Sep 17, 2009 at 02:22:51AM +0100, Ben Hutchings wrote: > > On Thu, 2009-09-17 at 02:07 +0200, Jean-Christophe PLAGNIOL-VILLARD > > wrote: > > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > > --- > > > drivers/net/wireless/wl12xx/wl1271_main.c | 3 +-- > > > 1 files changed, 1 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c > > > index d9169b4..f6f8895 100644 > > > --- a/drivers/net/wireless/wl12xx/wl1271_main.c > > > +++ b/drivers/net/wireless/wl12xx/wl1271_main.c > > > @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw, > > > { > > > struct wl1271 *wl = hw->priv; > > > struct sk_buff *beacon; > > > - DECLARE_MAC_BUF(mac); > > > int ret; > > > > > > wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s", > > > - print_mac(mac, conf->bssid)); > > > + printf("%pM", conf->bssid); > > > wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid, > > > conf->ssid_len); > > > > > > > That isn't even syntactically valid, let alone correct. > > Ugh, you're right -- remind me not to ACK things before bed... > > Jean-Christophe posted a new patch that looked better, although it > probably needs to be rebased on this one since I think Dave applied > it after my (misguided) ACK. ok I'll do asap really sorry Best Regards, J. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Date: Thu, 17 Sep 2009 16:42:08 +0200 > On 08:55 Thu 17 Sep , John W. Linville wrote: >> Ugh, you're right -- remind me not to ACK things before bed... >> >> Jean-Christophe posted a new patch that looked better, although it >> probably needs to be rebased on this one since I think Dave applied >> it after my (misguided) ACK. > ok I'll do asap really sorry I've already fixed this in my tree. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10:19 Thu 17 Sep , David Miller wrote: > From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Date: Thu, 17 Sep 2009 16:42:08 +0200 > > > On 08:55 Thu 17 Sep , John W. Linville wrote: > >> Ugh, you're right -- remind me not to ACK things before bed... > >> > >> Jean-Christophe posted a new patch that looked better, although it > >> probably needs to be rebased on this one since I think Dave applied > >> it after my (misguided) ACK. > > ok I'll do asap really sorry > > I've already fixed this in my tree. Tks Best Regards, J/ -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index d9169b4..f6f8895 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c @@ -644,11 +644,10 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw, { struct wl1271 *wl = hw->priv; struct sk_buff *beacon; - DECLARE_MAC_BUF(mac); int ret; wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s", - print_mac(mac, conf->bssid)); + printf("%pM", conf->bssid); wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid, conf->ssid_len);
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- drivers/net/wireless/wl12xx/wl1271_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)