Signed-off-by: Gustavo F. Padovan <[email protected]>
---
drivers/staging/brcm80211/sys/wlc_mac80211.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 5eb41d6..ee1bcc5 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -6910,7 +6910,7 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
preamble = 0;
if (IS_CCK(rspec)) {
if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
- WL_ERROR("Short CCK\n");
+ WL_ERROR("%s: Short CCK\n, __func__");
rx_status->flag |= RX_FLAG_SHORTPRE;
} else if (IS_OFDM(rspec)) {
rx_status->flag |= RX_FLAG_SHORTPRE;
--
1.7.4.rc2
Hi Brett,
* Brett Rudley <[email protected]> [2011-01-24 13:57:46 -0800]:
> > -----Original Message-----
> > From: Rafał Miłecki [mailto:[email protected]]
> > Sent: Monday, January 24, 2011 1:17 PM
> > To: Gustavo F. Padovan
> > Cc: Brett Rudley; Henry Ptasinski; Dowan Kim; [email protected]; Arend
> > Van Spriel; [email protected]
> > Subject: Re: [PATCH] brcm80211: fix error report string
> >
> > 2011/1/24 Gustavo F. Padovan <[email protected]>:
> > > Signed-off-by: Gustavo F. Padovan <[email protected]>
> > > ---
> > > drivers/staging/brcm80211/sys/wlc_mac80211.c | 2 +-
> > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c
> > b/drivers/staging/brcm80211/sys/wlc_mac80211.c
> > > index 5eb41d6..ee1bcc5 100644
> > > --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
> > > +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
> > > @@ -6910,7 +6910,7 @@ prep_mac80211_status(struct wlc_info *wlc,
> > d11rxhdr_t *rxh, struct sk_buff *p,
> > > preamble = 0;
> > > if (IS_CCK(rspec)) {
> > > if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
> > > - WL_ERROR("Short CCK\n");
> > > + WL_ERROR("%s: Short CCK\n, __func__");
> >
> > I have no idea how WL_ERROR works, but are you sure of that?
> >
> > You wrote:
> > "%s: Short CCK\n, __func__"
> >
> > Didn't you mean:
> > "%s: Short CCK\n", __func__
> > ?
> >
>
> Rafal's suggestion is correct, the patch was incorrect.
> (Good eyes, Rafal)
I just sent a corrected one yesterday in this thread.
--
Gustavo F. Padovan
http://profusion.mobi
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
drivers/staging/brcm80211/sys/wlc_mac80211.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 5eb41d6..a23dc5c 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -6910,7 +6910,7 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
preamble = 0;
if (IS_CCK(rspec)) {
if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
- WL_ERROR("Short CCK\n");
+ WL_ERROR("%s: Short CCK\n", __func__);
rx_status->flag |= RX_FLAG_SHORTPRE;
} else if (IS_OFDM(rspec)) {
rx_status->flag |= RX_FLAG_SHORTPRE;
--
1.7.4.rc2
Reporting another issue here. The README file is not correct with the content
of the linux-firmware tree. Seems that the changes added in this patch
http://www.spinics.net/lists/linux-wireless/msg60937.html
never arrived to linux-firmware.
Other than that, you guys are doing a great workon putting this driver
mainline. Mine broadcom card is working fine. :)
Regards,
* Gustavo F. Padovan <[email protected]> [2011-01-24 16:45:23 -0200]:
> Signed-off-by: Gustavo F. Padovan <[email protected]>
> ---
> drivers/staging/brcm80211/sys/wlc_mac80211.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
> index 5eb41d6..ee1bcc5 100644
> --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
> +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
> @@ -6910,7 +6910,7 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
> preamble = 0;
> if (IS_CCK(rspec)) {
> if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
> - WL_ERROR("Short CCK\n");
> + WL_ERROR("%s: Short CCK\n, __func__");
> rx_status->flag |= RX_FLAG_SHORTPRE;
> } else if (IS_OFDM(rspec)) {
> rx_status->flag |= RX_FLAG_SHORTPRE;
> --
> 1.7.4.rc2
>
--
Gustavo F. Padovan
http://profusion.mobi
PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBSYWZhxYIgTWnFgmVja2kgW21h
aWx0bzp6YWplYzVAZ21haWwuY29tXQ0KPiBTZW50OiBNb25kYXksIEphbnVhcnkgMjQsIDIwMTEg
MToxNyBQTQ0KPiBUbzogR3VzdGF2byBGLiBQYWRvdmFuDQo+IENjOiBCcmV0dCBSdWRsZXk7IEhl
bnJ5IFB0YXNpbnNraTsgRG93YW4gS2ltOyB2b3NzZW5AYnJvYWRjb20uY29tOyBBcmVuZA0KPiBW
YW4gU3ByaWVsOyBsaW51eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmcNCj4gU3ViamVjdDogUmU6
IFtQQVRDSF0gYnJjbTgwMjExOiBmaXggZXJyb3IgcmVwb3J0IHN0cmluZw0KPiANCj4gMjAxMS8x
LzI0IEd1c3Rhdm8gRi4gUGFkb3ZhbiA8cGFkb3ZhbkBwcm9mdXNpb24ubW9iaT46DQo+ID4gU2ln
bmVkLW9mZi1ieTogR3VzdGF2byBGLiBQYWRvdmFuIDxwYWRvdmFuQHByb2Z1c2lvbi5tb2JpPg0K
PiA+IC0tLQ0KPiA+IMKgZHJpdmVycy9zdGFnaW5nL2JyY204MDIxMS9zeXMvd2xjX21hYzgwMjEx
LmMgfCDCoCDCoDIgKy0NCj4gPiDCoDEgZmlsZXMgY2hhbmdlZCwgMSBpbnNlcnRpb25zKCspLCAx
IGRlbGV0aW9ucygtKQ0KPiA+DQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9icmNt
ODAyMTEvc3lzL3dsY19tYWM4MDIxMS5jDQo+IGIvZHJpdmVycy9zdGFnaW5nL2JyY204MDIxMS9z
eXMvd2xjX21hYzgwMjExLmMNCj4gPiBpbmRleCA1ZWI0MWQ2Li5lZTFiY2M1IDEwMDY0NA0KPiA+
IC0tLSBhL2RyaXZlcnMvc3RhZ2luZy9icmNtODAyMTEvc3lzL3dsY19tYWM4MDIxMS5jDQo+ID4g
KysrIGIvZHJpdmVycy9zdGFnaW5nL2JyY204MDIxMS9zeXMvd2xjX21hYzgwMjExLmMNCj4gPiBA
QCAtNjkxMCw3ICs2OTEwLDcgQEAgcHJlcF9tYWM4MDIxMV9zdGF0dXMoc3RydWN0IHdsY19pbmZv
ICp3bGMsDQo+IGQxMXJ4aGRyX3QgKnJ4aCwgc3RydWN0IHNrX2J1ZmYgKnAsDQo+ID4gwqAgwqAg
wqAgwqAgwqAgwqAgwqAgwqBwcmVhbWJsZSA9IDA7DQo+ID4gwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqBpZiAoSVNfQ0NLKHJzcGVjKSkgew0KPiA+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgaWYgKHJ4aC0+UGh5UnhTdGF0dXNfMCAmIFBSWFMwX1NIT1JUSCkNCj4gPiAtIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIFdMX0VSUk9SKCJTaG9ydCBD
Q0tcbiIpOw0KPiA+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgV0xfRVJST1IoIiVzOiBTaG9ydCBDQ0tcbiwgX19mdW5jX18iKTsNCj4gDQo+IEkgaGF2ZSBu
byBpZGVhIGhvdyBXTF9FUlJPUiB3b3JrcywgYnV0IGFyZSB5b3Ugc3VyZSBvZiB0aGF0Pw0KPiAN
Cj4gWW91IHdyb3RlOg0KPiAiJXM6IFNob3J0IENDS1xuLCBfX2Z1bmNfXyINCj4gDQo+IERpZG4n
dCB5b3UgbWVhbjoNCj4gIiVzOiBTaG9ydCBDQ0tcbiIsIF9fZnVuY19fDQo+ID8NCj4gDQoNClJh
ZmFsJ3Mgc3VnZ2VzdGlvbiBpcyBjb3JyZWN0LCB0aGUgcGF0Y2ggd2FzIGluY29ycmVjdC4NCihH
b29kIGV5ZXMsIFJhZmFsKQ0KDQpCcmV0dA0KDQo+IC0tDQo+IFJhZmHFgg0KDQo=
2011/1/24 Gustavo F. Padovan <[email protected]>:
> Signed-off-by: Gustavo F. Padovan <[email protected]>
> ---
> drivers/staging/brcm80211/sys/wlc_mac80211.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
> index 5eb41d6..ee1bcc5 100644
> --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
> +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
> @@ -6910,7 +6910,7 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
> preamble = 0;
> if (IS_CCK(rspec)) {
> if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
> - WL_ERROR("Short CCK\n");
> + WL_ERROR("%s: Short CCK\n, __func__");
I have no idea how WL_ERROR works, but are you sure of that?
You wrote:
"%s: Short CCK\n, __func__"
Didn't you mean:
"%s: Short CCK\n", __func__
?
--
Rafał