From 9380676de76994a0b99764b004df17bc14645ba7 Mon Sep 17 00:00:00 2001 From: solomon Date: Tue, 25 Feb 2003 17:30:47 +0000 Subject: [PATCH] clean up the WLAN_LOG_????n thingeys. --- CHANGES | 1 + TODO | 2 - src/include/wlan/wlan_compat.h | 133 ++++++--------------------- src/p80211/p80211conv.c | 28 +++--- src/p80211/p80211frm.c | 10 +- src/p80211/p80211netdev.c | 6 +- src/p80211/p80211wext.c | 2 +- src/prism2/driver/hfa384x.c | 102 ++++++++++----------- src/prism2/driver/hfa384x_usb.c | 130 +++++++++++++------------- src/prism2/driver/prism2mgmt.c | 122 ++++++++++++------------- src/prism2/driver/prism2mib.c | 10 +- src/prism2/driver/prism2sta.c | 156 ++++++++++++++++---------------- 12 files changed, 310 insertions(+), 392 deletions(-) diff --git a/CHANGES b/CHANGES index 22c4dbf..fee37be 100644 --- a/CHANGES +++ b/CHANGES @@ -42,6 +42,7 @@ * * -------------------------------------------------------------------- 0.1.16 + - Eliminated most of the WLAN_LOG_???n macros. - Minor fixups in /etc/wlan/shared - Cleaned up some of the error messages in the conversion code. - changed the "Host de-WEP failed" error to a debug message, as the diff --git a/TODO b/TODO index e801f85..4d10b53 100644 --- a/TODO +++ b/TODO @@ -43,7 +43,6 @@ * -------------------------------------------------------------------- Linux WLAN NG TODO -- Configure options depend on kernel version/pcmcia stuff/etc? - Make the command-completion interrupt driven vs busywaiting. - Possibly hook up DMA on the Rx side for PCI devices - [USB] Remove driver's port-reset when new primary firmware becomes @@ -92,6 +91,5 @@ Linux WLAN NG TODO reassociate - Add event handling scripts for the events above - Add AP support for power managing stations -- [PCMCIA] Improve PCMCIA event scripts - Add a HOWTO document for users - Add a HOWTO document for programmers diff --git a/src/include/wlan/wlan_compat.h b/src/include/wlan/wlan_compat.h index 57ba662..380fa85 100644 --- a/src/include/wlan/wlan_compat.h +++ b/src/include/wlan/wlan_compat.h @@ -97,9 +97,6 @@ #define WLAN_HPPAARCH 10 #define WLAN_SPARCARCH 11 #define WLAN_SHARCH 12 -/* WLAN_OS */ - #define WLAN_LINUX_KERNEL 1 - #define WLAN_LINUX_USER 2 /* WLAN_HOSTIF (generally set on the command line, not detected) */ #define WLAN_PCMCIA 1 #define WLAN_ISA 2 @@ -112,13 +109,6 @@ /* isn't a real PCMCIA host interface adapter providing all the */ /* card&socket services. */ -/* Lets try to figure out what we've got. Kernel mode or User mode? */ -#if defined(__KERNEL__) - #define WLAN_OS WLAN_LINUX_KERNEL -#else - #define WLAN_OS WLAN_LINUX_USER -#endif - #ifdef __powerpc__ #ifndef __ppc__ #define __ppc__ @@ -284,112 +274,41 @@ typedef signed long long INT64; #define WLAN_DBVAR wlan_debug #endif -#if (WLAN_OS == WLAN_LINUX_KERNEL) - #define WLAN_LOG_ERROR0(x) printk(KERN_ERR "%s: " x , __FUNCTION__ ); - #define WLAN_LOG_ERROR1(x,n) printk(KERN_ERR "%s: " x , __FUNCTION__ , (n)); - #define WLAN_LOG_ERROR2(x,n1,n2) printk(KERN_ERR "%s: " x , __FUNCTION__ , (n1), (n2)); - #define WLAN_LOG_ERROR3(x,n1,n2,n3) printk(KERN_ERR "%s: " x , __FUNCTION__, (n1), (n2), (n3)); - #define WLAN_LOG_ERROR4(x,n1,n2,n3,n4) printk(KERN_ERR "%s: " x , __FUNCTION__, (n1), (n2), (n3), (n4)); +#define WLAN_LOG_ERROR0(x) printk(KERN_ERR "%s: " x , __FUNCTION__ ); +#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __FUNCTION__ , args); - #define WLAN_LOG_WARNING0(x) printk(KERN_WARNING "%s: " x , __FUNCTION__); - #define WLAN_LOG_WARNING1(x,n) printk(KERN_WARNING "%s: " x , __FUNCTION__, (n)); - #define WLAN_LOG_WARNING2(x,n1,n2) printk(KERN_WARNING "%s: " x , __FUNCTION__, (n1), (n2)); - #define WLAN_LOG_WARNING3(x,n1,n2,n3) printk(KERN_WARNING "%s: " x , __FUNCTION__, (n1), (n2), (n3)); - #define WLAN_LOG_WARNING4(x,n1,n2,n3,n4) printk(KERN_WARNING "%s: " x , __FUNCTION__ , (n1), (n2), (n3), (n4)); +#define WLAN_LOG_WARNING0(x) printk(KERN_WARNING "%s: " x , __FUNCTION__); +#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __FUNCTION__, args); - #define WLAN_LOG_NOTICE0(x) printk(KERN_NOTICE "%s: " x , __FUNCTION__); - #define WLAN_LOG_NOTICE1(x,n) printk(KERN_NOTICE "%s: " x , __FUNCTION__, (n)); - #define WLAN_LOG_NOTICE2(x,n1,n2) printk(KERN_NOTICE "%s: " x , __FUNCTION__, (n1), (n2)); - #define WLAN_LOG_NOTICE3(x,n1,n2,n3) printk(KERN_NOTICE "%s: " x , __FUNCTION__, (n1), (n2), (n3)); - #define WLAN_LOG_NOTICE4(x,n1,n2,n3,n4) printk(KERN_NOTICE "%s: " x , __FUNCTION__, (n1), (n2), (n3), (n4)); +#define WLAN_LOG_NOTICE0(x) printk(KERN_NOTICE "%s: " x , __FUNCTION__); +#define WLAN_LOG_NOTICE(x, args...) printk(KERN_NOTICE "%s: " x , __FUNCTION__, args); - #define WLAN_LOG_INFO0(x) printk(KERN_INFO x); - #define WLAN_LOG_INFO1(x,n) printk(KERN_INFO x, (n)); - #define WLAN_LOG_INFO2(x,n1,n2) printk(KERN_INFO x, (n1), (n2)); - #define WLAN_LOG_INFO3(x,n1,n2,n3) printk(KERN_INFO x, (n1), (n2), (n3)); - #define WLAN_LOG_INFO4(x,n1,n2,n3,n4) printk(KERN_INFO x, (n1), (n2), (n3), (n4)); - #define WLAN_LOG_INFO5(x,n1,n2,n3,n4,n5) printk(KERN_INFO x, (n1), (n2), (n3), (n4), (n5)); +#define WLAN_LOG_INFO(args... ) printk(KERN_INFO args) - #if defined(WLAN_INCLUDE_DEBUG) - #define WLAN_ASSERT(c) if ((!(c)) && WLAN_DBVAR >= 1) { \ - WLAN_LOG_DEBUG0(1, "Assertion failure!\n"); } - #define WLAN_HEX_DUMP( l, x, p, n) if( WLAN_DBVAR >= (l) ){ \ - int __i__; \ - printk(KERN_DEBUG x ":"); \ - for( __i__=0; __i__ < (n); __i__++) \ - printk( " %02x", ((UINT8*)(p))[__i__]); \ - printk("\n"); } +#if defined(WLAN_INCLUDE_DEBUG) + #define WLAN_ASSERT(c) if ((!(c)) && WLAN_DBVAR >= 1) { \ + WLAN_LOG_DEBUG0(1, "Assertion failure!\n"); } + #define WLAN_HEX_DUMP( l, x, p, n) if( WLAN_DBVAR >= (l) ){ \ + int __i__; \ + printk(KERN_DEBUG x ":"); \ + for( __i__=0; __i__ < (n); __i__++) \ + printk( " %02x", ((UINT8*)(p))[__i__]); \ + printk("\n"); } + #define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG0(3,"---->\n"); } } + #define DBFEXIT { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG0(3,"<----\n"); } } - #define DBFENTER { if ( WLAN_DBVAR >= 4 ){ WLAN_LOG_DEBUG0(3,"Enter\n"); } } - #define DBFEXIT { if ( WLAN_DBVAR >= 4 ){ WLAN_LOG_DEBUG0(3,"Exit\n"); } } - - #define WLAN_LOG_DEBUG0(l,x) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__ ); - #define WLAN_LOG_DEBUG1(l,x,n) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__ , (n)); - #define WLAN_LOG_DEBUG2(l,x,n1,n2) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__ , (n1), (n2)); - #define WLAN_LOG_DEBUG3(l,x,n1,n2,n3) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__ , (n1), (n2), (n3)); - #define WLAN_LOG_DEBUG4(l,x,n1,n2,n3,n4) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__ , (n1), (n2), (n3), (n4)); - #define WLAN_LOG_DEBUG5(l,x,n1,n2,n3,n4,n5) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__ , (n1), (n2), (n3), (n4), (n5)); - #define WLAN_LOG_DEBUG6(l,x,n1,n2,n3,n4,n5,n6) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__ , (n1), (n2), (n3), (n4), (n5), (n6)); - #else - #define WLAN_ASSERT(c) - #define WLAN_HEX_DUMP( l, s, p, n) - - #define DBFENTER - #define DBFEXIT - - #define WLAN_LOG_DEBUG0(l, s) - #define WLAN_LOG_DEBUG1(l, s,n) - #define WLAN_LOG_DEBUG2(l, s,n1,n2) - #define WLAN_LOG_DEBUG3(l, s,n1,n2,n3) - #define WLAN_LOG_DEBUG4(l, s,n1,n2,n3,n4) - #define WLAN_LOG_DEBUG5(l, s,n1,n2,n3,n4,n5) - #endif + #define WLAN_LOG_DEBUG0(l,x) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__ ); + #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s: " x , __FUNCTION__, args ); #else - #define WLAN_LOG_ERROR0(s) - #define WLAN_LOG_ERROR1(s,n) - #define WLAN_LOG_ERROR2(s,n1,n2) - #define WLAN_LOG_ERROR3(s,n1,n2,n3) - #define WLAN_LOG_ERROR4(s,n1,n2,n3,n4) + #define WLAN_ASSERT(c) + #define WLAN_HEX_DUMP( l, s, p, n) + #define DBFENTER + #define DBFEXIT - #define WLAN_LOG_WARNING0(s) - #define WLAN_LOG_WARNING1(s,n) - #define WLAN_LOG_WARNING2(s,n1,n2) - #define WLAN_LOG_WARNING3(s,n1,n2,n3) - #define WLAN_LOG_WARNING4(s,n1,n2,n3,n4) - - #define WLAN_LOG_NOTICE0(s) - #define WLAN_LOG_NOTICE1(s,n) - #define WLAN_LOG_NOTICE2(s,n1,n2) - #define WLAN_LOG_NOTICE3(s,n1,n2,n3) - #define WLAN_LOG_NOTICE4(s,n1,n2,n3,n4) - - #define WLAN_ASSERT(c) - #define WLAN_HEX_DUMP( l, s, p, n) - - #define DBFENTER - #define DBFEXIT - - #define WLAN_LOG_INFO0(s) - #define WLAN_LOG_INFO1(s,n) - #define WLAN_LOG_INFO2(s,n1,n2) - #define WLAN_LOG_INFO3(s,n1,n2,n3) - #define WLAN_LOG_INFO4(s,n1,n2,n3,n4) - #define WLAN_LOG_INFO5(s,n1,n2,n3,n4,n5) - - #define WLAN_LOG_DEBUG0(l, s) - #define WLAN_LOG_DEBUG1(l, s,n) - #define WLAN_LOG_DEBUG2(l, s,n1,n2) - #define WLAN_LOG_DEBUG3(l, s,n1,n2,n3) - #define WLAN_LOG_DEBUG4(l, s,n1,n2,n3,n4) - #define WLAN_LOG_DEBUG5(l, s,n1,n2,n3,n4,n5) + #define WLAN_LOG_DEBUG0(l, s) + #define WLAN_LOG_DEBUG(l, s,n) #endif -#define wlan_ms_per_tick (1000UL / (wlan_ticks_per_sec)) -#define wlan_ms_to_ticks(n) ( (n) / (wlan_ms_per_tick)) -#define wlan_tu2ticks(n) ( (n) / (wlan_ms_per_tick)) -#define WLAN_INT_DISABLE(n) { save_flags((n)); cli(); } -#define WLAN_INT_ENABLE(n) { sti(); restore_flags((n)); } - #ifdef CONFIG_MODVERSIONS #define MODVERSIONS 1 #include diff --git a/src/p80211/p80211conv.c b/src/p80211/p80211conv.c index 5ccc65b..0624161 100644 --- a/src/p80211/p80211conv.c +++ b/src/p80211/p80211conv.c @@ -154,7 +154,7 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * } if ( ethconv == WLAN_ETHCONV_ENCAP ) { /* simplest case */ - WLAN_LOG_DEBUG1(3, "ENCAP len: %d\n", skb->len); + WLAN_LOG_DEBUG(3, "ENCAP len: %d\n", skb->len); /* here, we don't care what kind of ether frm. Just stick it */ /* in the 80211 payload */ /* which is to say, leave the skb alone. */ @@ -162,7 +162,7 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * /* step 1: classify ether frame, DIX or 802.3? */ proto = ntohs(e_hdr.type); if ( proto <= 1500 ) { - WLAN_LOG_DEBUG1(3, "802.3 len: %d\n", skb->len); + WLAN_LOG_DEBUG(3, "802.3 len: %d\n", skb->len); /* codes <= 1500 reserved for 802.3 lengths */ /* it's 802.3, pass ether payload unchanged, */ @@ -172,7 +172,7 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * /* leave off any PAD octets. */ skb_trim(skb, proto); } else { - WLAN_LOG_DEBUG1(3, "DIXII len: %d\n", skb->len); + WLAN_LOG_DEBUG(3, "DIXII len: %d\n", skb->len); /* it's DIXII, time for some conversion */ /* trim off ethernet header */ @@ -240,7 +240,7 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * skb->len, (wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK), p80211_wep->iv, p80211_wep->icv))) { - WLAN_LOG_WARNING1("Host en-WEP failed, dropping frame (%d).\n", foo); + WLAN_LOG_WARNING("Host en-WEP failed, dropping frame (%d).\n", foo); return 2; } fc |= host2ieee16(WLAN_SET_FC_ISWEP(1)); @@ -324,7 +324,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * /* perform de-wep if necessary.. */ if ((wlandev->hostwep & HOSTWEP_PRIVACYINVOKED) && WLAN_GET_FC_ISWEP(fc) && (wlandev->hostwep & HOSTWEP_DECRYPT)) { if (payload_length <= 8) { - WLAN_LOG_ERROR1("WEP frame too short (%u).\n", + WLAN_LOG_ERROR("WEP frame too short (%u).\n", skb->len); return 1; } @@ -333,7 +333,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * skb->data + payload_offset, skb->data + payload_offset + payload_length - 4))) { /* de-wep failed, drop skb. */ - WLAN_LOG_DEBUG1(1, "Host de-WEP failed, dropping frame (%d).\n", foo); + WLAN_LOG_DEBUG(1, "Host de-WEP failed, dropping frame (%d).\n", foo); wlandev->rx.decrypt_err++; return 2; } @@ -358,13 +358,13 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * ( e_llc->dsap != 0xaa || e_llc->ssap != 0xaa ) && ((memcmp(daddr, e_hdr->daddr, WLAN_ETHADDR_LEN) == 0) || (memcmp(saddr, e_hdr->saddr, WLAN_ETHADDR_LEN) == 0))) { - WLAN_LOG_DEBUG1(3, "802.3 ENCAP len: %d\n", payload_length); + WLAN_LOG_DEBUG(3, "802.3 ENCAP len: %d\n", payload_length); /* 802.3 Encapsulated */ /* Test for an overlength frame */ if ( payload_length > WLAN_MAX_ETHFRM_LEN) { /* A bogus length ethfrm has been encap'd. */ /* Is someone trying an oflow attack? */ - WLAN_LOG_ERROR2("ENCAP frame too large (%d > %d)\n", + WLAN_LOG_ERROR("ENCAP frame too large (%d > %d)\n", payload_length, WLAN_MAX_ETHFRM_LEN); return 1; } @@ -383,7 +383,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * (p80211_stt_findproto(ieee2host16(e_snap->type)))) || (memcmp( e_snap->oui, oui_rfc1042, WLAN_IEEE_OUI_LEN)!=0))) { - WLAN_LOG_DEBUG1(3, "SNAP+RFC1042 len: %d\n", payload_length); + WLAN_LOG_DEBUG(3, "SNAP+RFC1042 len: %d\n", payload_length); /* it's a SNAP + RFC1042 frame && protocol is in STT */ /* build 802.3 + RFC1042 */ @@ -391,7 +391,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * if ( payload_length + WLAN_ETHHDR_LEN > WLAN_MAX_ETHFRM_LEN ) { /* A bogus length ethfrm has been sent. */ /* Is someone trying an oflow attack? */ - WLAN_LOG_ERROR2("SNAP frame too large (%d > %d)\n", + WLAN_LOG_ERROR("SNAP frame too large (%d > %d)\n", payload_length, WLAN_MAX_ETHFRM_LEN); return 1; } @@ -412,7 +412,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa) && (e_llc->ctl == 0x03) ) { - WLAN_LOG_DEBUG1(3, "802.1h/RFC1042 len: %d\n", payload_length); + WLAN_LOG_DEBUG(3, "802.1h/RFC1042 len: %d\n", payload_length); /* it's an 802.1h frame || (an RFC1042 && protocol is not in STT) */ /* build a DIXII + RFC894 */ @@ -420,7 +420,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * if ( payload_length - sizeof(wlan_llc_t) - sizeof(wlan_snap_t) + WLAN_ETHHDR_LEN > WLAN_MAX_ETHFRM_LEN) { /* A bogus length ethfrm has been sent. */ /* Is someone trying an oflow attack? */ - WLAN_LOG_ERROR2("DIXII frame too large (%d > %d)\n", + WLAN_LOG_ERROR("DIXII frame too large (%d > %d)\n", payload_length - sizeof(wlan_llc_t) - sizeof(wlan_snap_t), WLAN_MAX_ETHFRM_LEN - WLAN_ETHHDR_LEN); return 1; @@ -444,7 +444,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * /* chop off the 802.11 CRC */ skb_trim(skb, skb->len - WLAN_CRC_LEN); } else { - WLAN_LOG_DEBUG1(3, "NON-ENCAP len: %d\n", payload_length); + WLAN_LOG_DEBUG(3, "NON-ENCAP len: %d\n", payload_length); /* any NON-ENCAP */ /* it's a generic 80211+LLC or IPX 'Raw 802.3' */ /* build an 802.3 frame */ @@ -454,7 +454,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * if ( payload_length + WLAN_ETHHDR_LEN > WLAN_MAX_ETHFRM_LEN) { /* A bogus length ethfrm has been sent. */ /* Is someone trying an oflow attack? */ - WLAN_LOG_ERROR2("OTHER frame too large (%d > %d)\n", + WLAN_LOG_ERROR("OTHER frame too large (%d > %d)\n", payload_length, WLAN_MAX_ETHFRM_LEN - WLAN_ETHHDR_LEN); return 1; diff --git a/src/p80211/p80211frm.c b/src/p80211/p80211frm.c index 4283f90..003af9c 100644 --- a/src/p80211/p80211frm.c +++ b/src/p80211/p80211frm.c @@ -246,7 +246,7 @@ void wlan_mgmt_decode_beacon( wlan_fr_beacon_t *f ) f->tim = (wlan_ie_tim_t*)ie_ptr; break; default: - WLAN_LOG_WARNING1( + WLAN_LOG_WARNING( "Unrecognized EID=%dd in beacon decode.\n",ie_ptr->eid); WLAN_HEX_DUMP(3, "frm w/ bad eid:", f->buf, f->len ); break; @@ -520,7 +520,7 @@ void wlan_mgmt_decode_assocreq( wlan_fr_assocreq_t *f ) f->supp_rates = (wlan_ie_supp_rates_t*)ie_ptr; break; default: - WLAN_LOG_WARNING1( + WLAN_LOG_WARNING( "Unrecognized EID=%dd in assocreq decode.\n", ie_ptr->eid); WLAN_HEX_DUMP(3, "frm w/ bad eid:", f->buf, f->len ); @@ -727,7 +727,7 @@ void wlan_mgmt_decode_reassocreq( wlan_fr_reassocreq_t *f ) f->supp_rates = (wlan_ie_supp_rates_t*)ie_ptr; break; default: - WLAN_LOG_WARNING1( + WLAN_LOG_WARNING( "Unrecognized EID=%dd in reassocreq decode.\n", ie_ptr->eid); WLAN_HEX_DUMP(3, "frm w/ bad eid:", f->buf, f->len ); @@ -920,7 +920,7 @@ void wlan_mgmt_decode_probereq( wlan_fr_probereq_t *f ) f->supp_rates = (wlan_ie_supp_rates_t*)ie_ptr; break; default: - WLAN_LOG_WARNING1( + WLAN_LOG_WARNING( "Unrecognized EID=%dd in probereq decode.\n", ie_ptr->eid); WLAN_HEX_DUMP(3, "frm w/ bad eid:", f->buf, f->len ); @@ -1045,7 +1045,7 @@ void wlan_mgmt_decode_proberesp( wlan_fr_proberesp_t *f ) f->ibss_parms = (wlan_ie_ibss_parms_t*)ie_ptr; break; default: - WLAN_LOG_WARNING2( + WLAN_LOG_WARNING( "Bad EID=%dd in proberesp, off=%d .\n", ie_ptr->eid, f->buf - (UINT8*)ie_ptr); WLAN_HEX_DUMP(3, "frm w/ bad eid:", f->buf, f->len ); diff --git a/src/p80211/p80211netdev.c b/src/p80211/p80211netdev.c index 25457de..e69165a 100644 --- a/src/p80211/p80211netdev.c +++ b/src/p80211/p80211netdev.c @@ -517,7 +517,7 @@ int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netdev) } else { if ( skb_ether_to_p80211(wlandev, wlandev->ethconv, skb, &p80211_hdr, &p80211_wep) != 0 ) { /* convert failed */ - WLAN_LOG_DEBUG1(1, "ether_to_80211(%d) failed.\n", + WLAN_LOG_DEBUG(1, "ether_to_80211(%d) failed.\n", wlandev->ethconv); result = 1; goto failed; @@ -664,7 +664,7 @@ int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) UINT8 *msgbuf; DBFENTER; - WLAN_LOG_DEBUG2(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len); + WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len); #if WIRELESS_EXT < 13 /* Is this a wireless extensions ioctl? */ @@ -1173,7 +1173,7 @@ int wlandev_get_index(wlandevice_t *wlandev) for ( i = 0; i < MAX_WLAN_DEVICES; i++) { if ( wlandev_index[i] == NULL ) { sprintf(wlandev->name, "wlan%d", i); - WLAN_LOG_DEBUG1(1,"Loading device '%s'...\n", wlandev->name); + WLAN_LOG_DEBUG(1,"Loading device '%s'...\n", wlandev->name); wlandev_index[i] = wlandev; return i; } diff --git a/src/p80211/p80211wext.c b/src/p80211/p80211wext.c index 982d2da..505473a 100644 --- a/src/p80211/p80211wext.c +++ b/src/p80211/p80211wext.c @@ -713,7 +713,7 @@ int p80211wext_support_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) goto exit; } - WLAN_LOG_DEBUG1(1, "Received wireless extension ioctl #%d.\n", cmd); + WLAN_LOG_DEBUG(1, "Received wireless extension ioctl #%d.\n", cmd); switch (cmd) { #if WIRELESS_EXT < 13 diff --git a/src/prism2/driver/hfa384x.c b/src/prism2/driver/hfa384x.c index 759a9f3..56a856e 100644 --- a/src/prism2/driver/hfa384x.c +++ b/src/prism2/driver/hfa384x.c @@ -655,13 +655,13 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) /* Check for aux available */ result = hfa384x_cmd_aux_enable(hw); if ( result ) { - WLAN_LOG_DEBUG1(1,"aux_enable() failed. result=%d\n", result); + WLAN_LOG_DEBUG(1,"aux_enable() failed. result=%d\n", result); goto failed; } /* Read the pda from each known address. */ for ( i = 0; i < (sizeof(pdaloc)/sizeof(pdaloc[0])); i++) { - WLAN_LOG_DEBUG2( 3, "Checking PDA@(0x%08lx,%s)\n", + WLAN_LOG_DEBUG( 3, "Checking PDA@(0x%08lx,%s)\n", pdaloc[i].cardaddr, pdaloc[i].auxctl == HFA384x_AUX_CTL_NV ? "CTL_NV" : "CTL_EXTDS"); @@ -695,7 +695,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) (currpdr + 2) * sizeof(UINT16)); pdacrc =hfa384x2host_16(pda[currpdr+2]); if ( crc != pdacrc ) { - WLAN_LOG_DEBUG2(3, + WLAN_LOG_DEBUG(3, "PDA crc failed:" "calc_crc=0x%04x," "pdr_crc=0x%04x.\n", @@ -703,7 +703,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) pdaok = 0; } } else { - WLAN_LOG_DEBUG1(3, + WLAN_LOG_DEBUG(3, "END record detected w/ " "len(%d) != 2, assuming bad PDA\n", pdrlen); @@ -715,12 +715,12 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) /* Test the record length */ if ( pdrlen > HFA384x_PDR_LEN_MAX || pdrlen == 0) { - WLAN_LOG_DEBUG4(3, + WLAN_LOG_DEBUG(3, "pdrlen for address #%d " "at %#lx:%#x:%d\n", i, pdaloc[i].cardaddr, pdaloc[i].auxctl, pdrlen); - WLAN_LOG_DEBUG1(3,"pdrlen invalid=%d\n", + WLAN_LOG_DEBUG(3,"pdrlen invalid=%d\n", pdrlen); pdaok = 0; break; @@ -740,7 +740,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) } } if ( pdaok ) { - WLAN_LOG_INFO2( + WLAN_LOG_INFO( "PDA Read from 0x%08lx in %s space.\n", pdaloc[i].cardaddr, pdaloc[i].auxctl == 0 ? "EXTDS" : @@ -852,13 +852,13 @@ int hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr) hw->dltimeout = hfa384x2host_16(hw->dltimeout); #if 0 -WLAN_LOG_DEBUG1(1,"ramdl_enable, exeaddr=0x%08x\n", exeaddr); +WLAN_LOG_DEBUG(1,"ramdl_enable, exeaddr=0x%08x\n", exeaddr); hw->dlstate = HFA384x_DLSTATE_RAMENABLED; #endif /* Enable the aux port */ if ( (result = hfa384x_cmd_aux_enable(hw)) ) { - WLAN_LOG_DEBUG1(1,"Aux enable failed, result=%d.\n", result); + WLAN_LOG_DEBUG(1,"Aux enable failed, result=%d.\n", result); return result; } @@ -872,7 +872,7 @@ hw->dlstate = HFA384x_DLSTATE_RAMENABLED; /* Set the download state */ hw->dlstate = HFA384x_DLSTATE_RAMENABLED; } else { - WLAN_LOG_DEBUG3(1,"cmd_download(0x%04x, 0x%04x) failed, result=%d.\n", + WLAN_LOG_DEBUG(1,"cmd_download(0x%04x, 0x%04x) failed, result=%d.\n", lowaddr,hiaddr, result); /* Disable the aux port */ hfa384x_cmd_aux_disable(hw); @@ -961,7 +961,7 @@ int hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len) return -EINVAL; } - WLAN_LOG_INFO2("Writing %ld bytes to ram @0x%06lx\n", len, daddr); + WLAN_LOG_INFO("Writing %ld bytes to ram @0x%06lx\n", len, daddr); #if 0 WLAN_HEX_DUMP(1, "dldata", buf, len); #endif @@ -1146,7 +1146,7 @@ int hfa384x_drvr_flashdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 le return -EINVAL; } - WLAN_LOG_INFO2("Download %ld bytes to flash @0x%06lx\n", len, daddr); + WLAN_LOG_INFO("Download %ld bytes to flash @0x%06lx\n", len, daddr); /* Need a flat address for arithmetic */ dlbufaddr = HFA384x_ADDR_AUX_MKFLAT( @@ -1155,7 +1155,7 @@ int hfa384x_drvr_flashdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 le verbuf = kmalloc(hw->bufinfo.len, GFP_KERNEL); #if 0 -WLAN_LOG_WARNING3("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw->bufinfo.len, hw->dltimeout); +WLAN_LOG_WARNING("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw->bufinfo.len, hw->dltimeout); #endif /* Figure out how many times to to the flash prog */ nwrites = len / hw->bufinfo.len; @@ -1174,7 +1174,7 @@ WLAN_LOG_WARNING3("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw->bufinfo.len, hw currdaddr = daddr + (hw->bufinfo.len * i); destlo = HFA384x_ADDR_CMD_MKOFF(currdaddr); desthi = HFA384x_ADDR_CMD_MKPAGE(currdaddr); - WLAN_LOG_INFO2("Writing %ld bytes to flash @0x%06lx\n", currlen, currdaddr); + WLAN_LOG_INFO("Writing %ld bytes to flash @0x%06lx\n", currlen, currdaddr); #if 0 WLAN_HEX_DUMP(1, "dldata", buf+(hw->bufinfo.len*i), currlen); #endif @@ -1182,7 +1182,7 @@ WLAN_HEX_DUMP(1, "dldata", buf+(hw->bufinfo.len*i), currlen); result = hfa384x_cmd_download(hw, HFA384x_PROGMODE_NV, destlo, desthi, currlen); if ( result ) { - WLAN_LOG_ERROR4("download(NV,lo=%x,hi=%x,len=%lx) " + WLAN_LOG_ERROR("download(NV,lo=%x,hi=%x,len=%lx) " "cmd failed, result=%d. Aborting d/l\n", destlo, desthi, currlen, result); goto exit_proc; @@ -1193,7 +1193,7 @@ WLAN_HEX_DUMP(1, "dldata", buf+(hw->bufinfo.len*i), currlen); /* set the download 'write flash' mode */ result = hfa384x_cmd_download(hw, HFA384x_PROGMODE_NVWRITE, 0,0,0); if ( result ) { - WLAN_LOG_ERROR4( + WLAN_LOG_ERROR( "download(NVWRITE,lo=%x,hi=%x,len=%lx) " "cmd failed, result=%d. Aborting d/l\n", destlo, desthi, currlen, result); @@ -1708,7 +1708,7 @@ int hfa384x_cmd_notify(hfa384x_t *hw, UINT16 reclaim, UINT16 fid, /* Copy the record to FID */ result = hfa384x_copy_to_bap(hw, HFA384x_BAP_PROC, hw->infofid, 0, buf, len); if ( result ) { - WLAN_LOG_DEBUG3(1, + WLAN_LOG_DEBUG(1, "copy_to_bap(%04x, 0, %d) failed, result=0x%x\n", hw->infofid, len, result); result = -EIO; @@ -1836,7 +1836,7 @@ int hfa384x_cmd_access(hfa384x_t *hw, UINT16 write, UINT16 rid, result = hfa384x_docmd_wait(hw, &cmd); if ( result ) { - WLAN_LOG_ERROR2("Call to hfa384x_docmd_wait failed (%d %d)\n", + WLAN_LOG_ERROR("Call to hfa384x_docmd_wait failed (%d %d)\n", result, cmd.resp0); goto fail; } @@ -1850,7 +1850,7 @@ int hfa384x_cmd_access(hfa384x_t *hw, UINT16 write, UINT16 rid, /* Validate the record length */ if ( ((hfa384x2host_16(rec.reclen)-1)*2) != len ) { /* note body len calculation in bytes */ - WLAN_LOG_DEBUG3(1, "RID len mismatch, rid=0x%04x hlen=%d fwlen=%d\n", + WLAN_LOG_DEBUG(1, "RID len mismatch, rid=0x%04x hlen=%d fwlen=%d\n", rid, len, (hfa384x2host_16(rec.reclen)-1)*2); result = -ENODATA; goto fail; @@ -2227,8 +2227,8 @@ hfa384x_drvr_mmi_write(hfa384x_t *hw, UINT32 addr, UINT32 data) cmd.parm1 = (UINT16) data; cmd.parm2 = 0; - WLAN_LOG_DEBUG1(1,"mmi write : addr = 0x%08lx\n", addr); - WLAN_LOG_DEBUG1(1,"mmi write : data = 0x%08lx\n", data); + WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08lx\n", addr); + WLAN_LOG_DEBUG(1,"mmi write : data = 0x%08lx\n", data); /* Do i need a host2hfa... conversion ? */ result = hfa384x_docmd_wait(hw, &cmd); @@ -2380,7 +2380,7 @@ int hfa384x_copy_from_bap(hfa384x_t *hw, UINT16 bap, UINT16 id, UINT16 offset, #endif if (result) { - WLAN_LOG_DEBUG3(1, + WLAN_LOG_DEBUG(1, "copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n", reg, len, result); } @@ -2605,7 +2605,7 @@ hfa384x_copy_from_aux( DBFENTER; if ( !(hw->auxen) ) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "Attempt to read 0x%04lx when aux not enabled\n", cardaddr); return; @@ -2674,7 +2674,7 @@ hfa384x_copy_to_aux( DBFENTER; if ( !(hw->auxen) ) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "Attempt to read 0x%04lx when aux not enabled\n", cardaddr); return; @@ -2763,7 +2763,7 @@ int hfa384x_docmd_wait( hfa384x_t *hw, hfa384x_metacmd_t *cmd) printk("counter(1)=%d\n", counter); #endif if (HFA384x_CMD_ISBUSY(reg)) { - WLAN_LOG_ERROR1("hfa384x_cmd timeout(1), reg=0x%0hx.\n", reg); + WLAN_LOG_ERROR("hfa384x_cmd timeout(1), reg=0x%0hx.\n", reg); goto failed; } if (!HFA384x_CMD_ISBUSY(reg)) { @@ -2809,7 +2809,7 @@ int hfa384x_docmd_wait( hfa384x_t *hw, hfa384x_metacmd_t *cmd) HFA384x_EVACK); result = HFA384x_STATUS_RESULT_GET(cmd->status); } else { - WLAN_LOG_ERROR1("hfa384x_cmd timeout(2), reg=0x%0hx.\n", reg); + WLAN_LOG_ERROR("hfa384x_cmd timeout(2), reg=0x%0hx.\n", reg); } #endif /* CMD_IRQ */ } @@ -2958,7 +2958,7 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime) ((dev_link_t*)hw->membase)->handle, ®); if (result != CS_SUCCESS ) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( ":0: AccessConfigurationRegister(CS_READ) failed," "result=%d.\n", result); result = -EIO; @@ -2973,7 +2973,7 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime) ((dev_link_t*)hw->membase)->handle, ®); if (result != CS_SUCCESS ) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( ":1: AccessConfigurationRegister(CS_WRITE) failed," "result=%d.\n", result); result = -EIO; @@ -2990,7 +2990,7 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime) ((dev_link_t*)hw->membase)->handle, ®); if (result != CS_SUCCESS ) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( ":2: AccessConfigurationRegister(CS_WRITE) failed," "result=%d.\n", result); result = -EIO; @@ -3008,7 +3008,7 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime) ((dev_link_t*)hw->membase)->handle, ®); if (result != CS_SUCCESS ) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( ":2: AccessConfigurationRegister(CS_WRITE) failed," "result=%d.\n", result); result = -EIO; @@ -3144,7 +3144,7 @@ int hfa384x_drvr_start(hfa384x_t *hw) txfid_queue_add(hw, reg); - WLAN_LOG_DEBUG2(4,"hw->txfid_queue[%d]=0x%04x\n",i,reg); + WLAN_LOG_DEBUG(4,"hw->txfid_queue[%d]=0x%04x\n",i,reg); reg = HFA384x_EVACK_ALLOC_SET(1); hfa384x_setreg(hw, reg, HFA384x_EVACK); @@ -3171,7 +3171,7 @@ int hfa384x_drvr_start(hfa384x_t *hw) hw->infofid = hfa384x_getreg(hw, HFA384x_ALLOCFID); reg = HFA384x_EVACK_ALLOC_SET(1); hfa384x_setreg(hw, reg, HFA384x_EVACK); - WLAN_LOG_DEBUG1(4,"hw->infofid=0x%04x\n", hw->infofid); + WLAN_LOG_DEBUG(4,"hw->infofid=0x%04x\n", hw->infofid); /* Set swsupport regs to magic # for card presence detection */ hfa384x_setreg(hw, HFA384x_DRVR_MAGIC, HFA384x_SWSUPPORT0); @@ -3195,7 +3195,7 @@ int hfa384x_drvr_start(hfa384x_t *hw) goto done; failed: - WLAN_LOG_ERROR1("Failed, result=%d\n", result); + WLAN_LOG_ERROR("Failed, result=%d\n", result); done: DBFEXIT; return result; @@ -3345,7 +3345,7 @@ int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, p80211_hdr_t *p8021 } if ( result ) { - WLAN_LOG_DEBUG4(1, + WLAN_LOG_DEBUG(1, "copy_to_bap(%04x, %d, %d) failed, result=0x%x\n", fid, sizeof(txdesc), @@ -3365,7 +3365,7 @@ int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, p80211_hdr_t *p8021 if ( result != 0 ) { txfid_queue_add(hw, fid); - WLAN_LOG_DEBUG2(1,"cmd_tx(%04x) failed, result=%d\n", + WLAN_LOG_DEBUG(1,"cmd_tx(%04x) failed, result=%d\n", fid, result); result = 3; goto failed; @@ -3451,7 +3451,7 @@ void hfa384x_interrupt(int irq, void *dev_id, struct pt_regs *regs) /* Check swsupport reg magic # for card presence */ reg = hfa384x_getreg(hw, HFA384x_SWSUPPORT0); if ( reg != HFA384x_DRVR_MAGIC) { - WLAN_LOG_DEBUG1(2, "irq=%d, no magic. Card removed?.\n", irq); + WLAN_LOG_DEBUG(2, "irq=%d, no magic. Card removed?.\n", irq); return; } @@ -3524,7 +3524,7 @@ void hfa384x_interrupt(int irq, void *dev_id, struct pt_regs *regs) /* Check swsupport reg magic # for card presence */ reg = hfa384x_getreg(hw, HFA384x_SWSUPPORT0); if ( reg != HFA384x_DRVR_MAGIC) { - WLAN_LOG_DEBUG1(2, "irq=%d, no magic. Card removed?.\n", irq); + WLAN_LOG_DEBUG(2, "irq=%d, no magic. Card removed?.\n", irq); return; } @@ -3681,7 +3681,7 @@ void hfa384x_int_info(wlandevice_t *wlandev) result = hfa384x_copy_from_bap( hw, HFA384x_BAP_INT, reg, 0, &inf.framelen, sizeof(UINT16)); if ( result ) { - WLAN_LOG_DEBUG3(1, + WLAN_LOG_DEBUG(1, "copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n", reg, sizeof(inf), result); goto failed; @@ -3693,7 +3693,7 @@ void hfa384x_int_info(wlandevice_t *wlandev) HFA384x_BAP_INT, reg, sizeof(UINT16), &(inf.infotype), inf.framelen * sizeof(UINT16)); if ( result ) { - WLAN_LOG_DEBUG3(1, + WLAN_LOG_DEBUG(1, "copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n", reg, sizeof(inf), result); goto failed; @@ -3736,7 +3736,7 @@ void hfa384x_int_txexc(wlandevice_t *wlandev) fid = hfa384x_getreg(hw, HFA384x_TXCOMPLFID); result = hfa384x_copy_from_bap(hw, HFA384x_BAP_INT, fid, 0, &status, sizeof(status)); if ( result ) { - WLAN_LOG_DEBUG3(1, + WLAN_LOG_DEBUG(1, "copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n", fid, sizeof(status), result); goto failed; @@ -3776,7 +3776,7 @@ void hfa384x_int_tx(wlandevice_t *wlandev) fid = hfa384x_getreg(hw, HFA384x_TXCOMPLFID); result = hfa384x_copy_from_bap(hw, HFA384x_BAP_INT, fid, 0, &status, sizeof(status)); if ( result ) { - WLAN_LOG_DEBUG3(1, + WLAN_LOG_DEBUG(1, "copy_from_bap(0x%04x, 0, %d) failed, result=0x%x\n", fid, sizeof(status), result); goto failed; @@ -3829,7 +3829,7 @@ void hfa384x_int_rx(wlandevice_t *wlandev) &rxdesc, sizeof(rxdesc)); if ( result ) { - WLAN_LOG_DEBUG4(1, + WLAN_LOG_DEBUG(1, "copy_from_bap(0x%04x, %d, %d) failed, result=0x%x\n", rxfid, 0, @@ -3856,7 +3856,7 @@ void hfa384x_int_rx(wlandevice_t *wlandev) result = hfa384x_int_rx_typedrop(wlandev, ieee2host16(rxdesc.frame_control)); if (result) { if (result != 1) - WLAN_LOG_WARNING1("Invalid frame type, fc=%04x, dropped.\n",rxdesc.frame_control); + WLAN_LOG_WARNING("Invalid frame type, fc=%04x, dropped.\n",rxdesc.frame_control); goto done; } @@ -3921,7 +3921,7 @@ void hfa384x_int_rx(wlandevice_t *wlandev) HFA384x_BAP_INT, rxfid, HFA384x_RX_DATA_OFF, datap, rxdesc.data_len); if ( result ) { - WLAN_LOG_DEBUG4(1, + WLAN_LOG_DEBUG(1, "copy_from_bap(0x%04x, %d, %d) failed, result=0x%x\n", rxfid, HFA384x_RX_DATA_OFF, @@ -3950,7 +3950,7 @@ void hfa384x_int_rx(wlandevice_t *wlandev) break; default: - WLAN_LOG_WARNING1("Received frame on unsupported port=%d\n", + WLAN_LOG_WARNING("Received frame on unsupported port=%d\n", HFA384x_RXSTATUS_MACPORT_GET(rxdesc.status) ); goto done; break; @@ -4034,7 +4034,7 @@ void hfa384x_int_rxmonitor( wlandevice_t *wlandev, UINT16 rxfid, hfa384x_rx_fram datalen = 0; break; default: - WLAN_LOG_DEBUG1(1, "unknown frm: fc=0x%04x\n", fc); + WLAN_LOG_DEBUG(1, "unknown frm: fc=0x%04x\n", fc); return; } @@ -4046,12 +4046,12 @@ void hfa384x_int_rxmonitor( wlandevice_t *wlandev, UINT16 rxfid, hfa384x_rx_fram if ( skblen > (sizeof(p80211msg_lnxind_wlansniffrm_t) + WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) { - WLAN_LOG_DEBUG1(1, "overlen frm: len=%d\n", + WLAN_LOG_DEBUG(1, "overlen frm: len=%d\n", skblen - sizeof(p80211msg_lnxind_wlansniffrm_t)); } if ( (skb = dev_alloc_skb(skblen)) == NULL ) { - WLAN_LOG_ERROR1("alloc_skb failed trying to allocate %d bytes\n", skblen); + WLAN_LOG_ERROR("alloc_skb failed trying to allocate %d bytes\n", skblen); return; } @@ -4215,7 +4215,7 @@ int hfa384x_int_rx_typedrop( wlandevice_t *wlandev, UINT16 fc) ftype = WLAN_GET_FC_FTYPE(fc); fstype = WLAN_GET_FC_FSTYPE(fc); #if 0 - WLAN_LOG_DEBUG2(4, + WLAN_LOG_DEBUG(4, "rx_typedrop : ftype=%d fstype=%d.\n", ftype, fstype); #endif switch ( ftype ) { @@ -4396,7 +4396,7 @@ void hfa384x_int_alloc(wlandevice_t *wlandev) fid = hfa384x_getreg(hw, HFA384x_ALLOCFID); if ( fid != hw->infofid ) { /* It's a transmit fid */ - WLAN_LOG_DEBUG1(5, "int_alloc(%#x)\n", fid); + WLAN_LOG_DEBUG(5, "int_alloc(%#x)\n", fid); result = txfid_queue_add(hw, fid); if (result != -1) { prism2sta_ev_alloc(wlandev); @@ -4456,7 +4456,7 @@ int hfa384x_drvr_handover( hfa384x_t *hw, UINT8 *addr) result = hfa384x_cmd_notify(hw, 1, hw->infofid, &rec, len); if ( result != 0 ) { - WLAN_LOG_DEBUG2(1,"cmd_notify(%04x) failed, result=%d", + WLAN_LOG_DEBUG(1,"cmd_notify(%04x) failed, result=%d", hw->infofid, result); result = -EIO; goto failed; diff --git a/src/prism2/driver/hfa384x_usb.c b/src/prism2/driver/hfa384x_usb.c index 04b7195..33871c0 100644 --- a/src/prism2/driver/hfa384x_usb.c +++ b/src/prism2/driver/hfa384x_usb.c @@ -328,20 +328,20 @@ hfa384x_isgood_pdrcode(UINT16 pdrcode); void dbprint_urb(struct urb* urb) { - WLAN_LOG_DEBUG1(3,"urb->pipe=0x%08x\n", urb->pipe); - WLAN_LOG_DEBUG1(3,"urb->status=0x%08x\n", urb->status); - WLAN_LOG_DEBUG1(3,"urb->transfer_flags=0x%08x\n", urb->transfer_flags); - WLAN_LOG_DEBUG1(3,"urb->transfer_buffer=0x%08x\n", (UINT)urb->transfer_buffer); - WLAN_LOG_DEBUG1(3,"urb->transfer_buffer_length=0x%08x\n", urb->transfer_buffer_length); - WLAN_LOG_DEBUG1(3,"urb->actual_length=0x%08x\n", urb->actual_length); - WLAN_LOG_DEBUG1(3,"urb->bandwidth=0x%08x\n", urb->bandwidth); - WLAN_LOG_DEBUG1(3,"urb->setup_packet(ctl)=0x%08x\n", (UINT)urb->setup_packet); - WLAN_LOG_DEBUG1(3,"urb->start_frame(iso/irq)=0x%08x\n", urb->start_frame); - WLAN_LOG_DEBUG1(3,"urb->interval(irq)=0x%08x\n", urb->interval); - WLAN_LOG_DEBUG1(3,"urb->error_count(iso)=0x%08x\n", urb->error_count); - WLAN_LOG_DEBUG1(3,"urb->timeout=0x%08x\n", urb->timeout); - WLAN_LOG_DEBUG1(3,"urb->context=0x%08x\n", (UINT)urb->context); - WLAN_LOG_DEBUG1(3,"urb->complete=0x%08x\n", (UINT)urb->complete); + WLAN_LOG_DEBUG(3,"urb->pipe=0x%08x\n", urb->pipe); + WLAN_LOG_DEBUG(3,"urb->status=0x%08x\n", urb->status); + WLAN_LOG_DEBUG(3,"urb->transfer_flags=0x%08x\n", urb->transfer_flags); + WLAN_LOG_DEBUG(3,"urb->transfer_buffer=0x%08x\n", (UINT)urb->transfer_buffer); + WLAN_LOG_DEBUG(3,"urb->transfer_buffer_length=0x%08x\n", urb->transfer_buffer_length); + WLAN_LOG_DEBUG(3,"urb->actual_length=0x%08x\n", urb->actual_length); + WLAN_LOG_DEBUG(3,"urb->bandwidth=0x%08x\n", urb->bandwidth); + WLAN_LOG_DEBUG(3,"urb->setup_packet(ctl)=0x%08x\n", (UINT)urb->setup_packet); + WLAN_LOG_DEBUG(3,"urb->start_frame(iso/irq)=0x%08x\n", urb->start_frame); + WLAN_LOG_DEBUG(3,"urb->interval(irq)=0x%08x\n", urb->interval); + WLAN_LOG_DEBUG(3,"urb->error_count(iso)=0x%08x\n", urb->error_count); + WLAN_LOG_DEBUG(3,"urb->timeout=0x%08x\n", urb->timeout); + WLAN_LOG_DEBUG(3,"urb->context=0x%08x\n", (UINT)urb->context); + WLAN_LOG_DEBUG(3,"urb->complete=0x%08x\n", (UINT)urb->complete); } #endif @@ -675,7 +675,7 @@ hfa384x_cmd_initialize(hfa384x_t *hw) result = hfa384x_docmd(hw, DOWAIT, &cmd, NULL, NULL); - WLAN_LOG_DEBUG4(3,"cmdresp.init: " + WLAN_LOG_DEBUG(3,"cmdresp.init: " "status=0x%04x, resp0=0x%04x, " "resp1=0x%04x, resp2=0x%04x\n", cmd.status, cmd.resp0, cmd.resp1, cmd.resp2); @@ -950,7 +950,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr, hfa384x_metacmd_t cmd; DBFENTER; - WLAN_LOG_DEBUG4(5, + WLAN_LOG_DEBUG(5, "mode=%d, lowaddr=0x%04x, highaddr=0x%04x, codelen=%d\n", mode, lowaddr, highaddr, codelen); @@ -1094,7 +1094,7 @@ int hfa384x_corereset( hfa384x_t *hw, int holdtime, int settletime) /* Set the device address */ result=usb_set_address(hw->usb); if (result < 0) { - WLAN_LOG_ERROR1("reset_usbdev: Dev not accepting address, " + WLAN_LOG_ERROR("reset_usbdev: Dev not accepting address, " "result=%d\n", result); clear_bit(hw->usb->devnum, &hw->usb->bus->devmap.devicemap); hw->usb->devnum = -1; @@ -1106,11 +1106,11 @@ int hfa384x_corereset( hfa384x_t *hw, int holdtime, int settletime) /* Assume we're reusing the original descriptor data */ /* Set the configuration. */ - WLAN_LOG_DEBUG1(3, "Setting Configuration %d\n", + WLAN_LOG_DEBUG(3, "Setting Configuration %d\n", hw->usb->config[0].bConfigurationValue); result=usb_set_configuration(hw->usb, hw->usb->config[0].bConfigurationValue); if ( result ) { - WLAN_LOG_ERROR1("usb_set_configuration() failed, result=%d.\n", + WLAN_LOG_ERROR("usb_set_configuration() failed, result=%d.\n", result); goto done; } @@ -1182,7 +1182,7 @@ hfa384x_docmd( ctlx->outbuf.cmdreq.parm1 = host2hfa384x_16(cmd->parm1); ctlx->outbuf.cmdreq.parm2 = host2hfa384x_16(cmd->parm2); - WLAN_LOG_DEBUG4(4, "cmdreq: cmd=0x%04x " + WLAN_LOG_DEBUG(4, "cmdreq: cmd=0x%04x " "parm0=0x%04x parm1=0x%04x parm2=0x%04x\n", cmd->cmd, cmd->parm0, @@ -1214,7 +1214,7 @@ hfa384x_docmd( cmd->resp0 = hfa384x2host_16(ctlx->inbuf.cmdresp.resp0); cmd->resp1 = hfa384x2host_16(ctlx->inbuf.cmdresp.resp1); cmd->resp2 = hfa384x2host_16(ctlx->inbuf.cmdresp.resp2); - WLAN_LOG_DEBUG4(4, "cmdresp:status=0x%04x " + WLAN_LOG_DEBUG(4, "cmdresp:status=0x%04x " "resp0=0x%04x resp1=0x%04x resp2=0x%04x\n", cmd->status, cmd->resp0, @@ -1343,7 +1343,7 @@ hfa384x_dorrid( /* Validate the length, note body len calculation in bytes */ maclen = ((hfa384x2host_16(ctlx->inbuf.rridresp.frmlen)-1)*2); if ( maclen != riddatalen ) { - WLAN_LOG_WARNING3( + WLAN_LOG_WARNING( "RID len mismatch, rid=0x%04x hlen=%d fwlen=%d\n", rid, riddatalen, maclen); result = -ENODATA; @@ -1582,14 +1582,14 @@ hfa384x_dormem( ctlx->outbuf.rmemreq.offset = host2hfa384x_16(offset); ctlx->outbuf.rmemreq.page = host2hfa384x_16(page); - WLAN_LOG_DEBUG4(4, + WLAN_LOG_DEBUG(4, "type=0x%04x frmlen=%d offset=0x%04x page=0x%04x\n", ctlx->outbuf.rmemreq.type, ctlx->outbuf.rmemreq.frmlen, ctlx->outbuf.rmemreq.offset, ctlx->outbuf.rmemreq.page); - WLAN_LOG_DEBUG1(4,"pktsize=%d\n", + WLAN_LOG_DEBUG(4,"pktsize=%d\n", ROUNDUP64(sizeof(ctlx->outbuf.rmemreq))); /* Fill the out packet */ @@ -1610,7 +1610,7 @@ hfa384x_dormem( /* On reawakening, check the ctlx status */ switch(ctlx->state) { case HFA384x_USBCTLX_COMPLETE: - WLAN_LOG_DEBUG1(4,"rmemresp:len=%d\n", + WLAN_LOG_DEBUG(4,"rmemresp:len=%d\n", ctlx->inbuf.rmemresp.frmlen); memcpy(data, ctlx->inbuf.rmemresp.data, len); result = 0; @@ -1698,7 +1698,7 @@ hfa384x_dowmem( hfa384x_usbctlx_t *ctlx; DBFENTER; - WLAN_LOG_DEBUG3(5, "page=0x%04x offset=0x%04x len=%d\n", + WLAN_LOG_DEBUG(5, "page=0x%04x offset=0x%04x len=%d\n", page,offset,len); ctlx = kmalloc(sizeof(*ctlx), GFP_ATOMIC); @@ -2061,20 +2061,20 @@ hfa384x_drvr_flashdl_write( int j; DBFENTER; - WLAN_LOG_DEBUG2(5,"daddr=0x%08lx len=%ld\n", daddr, len); + WLAN_LOG_DEBUG(5,"daddr=0x%08lx len=%ld\n", daddr, len); /* Check that we're in the flash download state */ if ( hw->dlstate != HFA384x_DLSTATE_FLASHENABLED ) { return -EINVAL; } - WLAN_LOG_INFO2("Download %ld bytes to flash @0x%06lx\n", len, daddr); + WLAN_LOG_INFO("Download %ld bytes to flash @0x%06lx\n", len, daddr); /* Convert to flat address for arithmetic */ /* NOTE: dlbuffer RID stores the address in AUX format */ dlbufaddr = HFA384x_ADDR_AUX_MKFLAT( hw->bufinfo.page, hw->bufinfo.offset); - WLAN_LOG_DEBUG3(5, + WLAN_LOG_DEBUG(5, "dlbuf.page=0x%04x dlbuf.offset=0x%04x dlbufaddr=0x%08lx\n", hw->bufinfo.page, hw->bufinfo.offset, dlbufaddr); @@ -2086,7 +2086,7 @@ hfa384x_drvr_flashdl_write( } #if 0 -WLAN_LOG_WARNING3("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw->bufinfo.len, hw->dltimeout); +WLAN_LOG_WARNING("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw->bufinfo.len, hw->dltimeout); #endif /* Calculations to determine how many fills of the dlbuffer to do * and how many USB wmemreq's to do for each fill. At this point @@ -2113,14 +2113,14 @@ WLAN_LOG_WARNING3("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw->bufinfo.len, hw burnlo = HFA384x_ADDR_CMD_MKOFF(burndaddr); burnhi = HFA384x_ADDR_CMD_MKPAGE(burndaddr); - WLAN_LOG_INFO2("Writing %ld bytes to flash @0x%06lx\n", + WLAN_LOG_INFO("Writing %ld bytes to flash @0x%06lx\n", burnlen, burndaddr); /* Set the download mode */ result = hfa384x_cmd_download(hw, HFA384x_PROGMODE_NV, burnlo, burnhi, burnlen); if ( result ) { - WLAN_LOG_ERROR4("download(NV,lo=%x,hi=%x,len=%lx) " + WLAN_LOG_ERROR("download(NV,lo=%x,hi=%x,len=%lx) " "cmd failed, result=%d. Aborting d/l\n", burnlo, burnhi, burnlen, result); goto exit_proc; @@ -2154,7 +2154,7 @@ WLAN_LOG_WARNING3("dlbuf@0x%06lx len=%d to=%d\n", dlbufaddr, hw->bufinfo.len, hw Comment out for debugging, assume the write was successful. if (result) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "Write to dl buffer failed, " "result=0x%04x. Aborting.\n", result); @@ -2169,7 +2169,7 @@ Comment out for debugging, assume the write was successful. HFA384x_PROGMODE_NVWRITE, 0,0,0); if ( result ) { - WLAN_LOG_ERROR4( + WLAN_LOG_ERROR( "download(NVWRITE,lo=%x,hi=%x,len=%lx) " "cmd failed, result=%d. Aborting d/l\n", burnlo, burnhi, burnlen, result); @@ -2463,8 +2463,8 @@ hfa384x_drvr_mmi_write(hfa384x_t *hw, UINT32 addr, UINT32 data) UINT16 param1 = (UINT16) data; DBFENTER; - WLAN_LOG_DEBUG1(1,"mmi write : addr = 0x%08lx\n", addr); - WLAN_LOG_DEBUG1(1,"mmi write : data = 0x%08lx\n", data); + WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08lx\n", addr); + WLAN_LOG_DEBUG(1,"mmi write : data = 0x%08lx\n", data); /* Do i need a host2hfa... conversion ? */ result = hfa384x_docmd_wait(hw, cmd_code, param0, param1, 0); @@ -2563,7 +2563,7 @@ hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr) return -EINVAL; } - WLAN_LOG_DEBUG1(3,"ramdl_enable, exeaddr=0x%08lx\n", exeaddr); + WLAN_LOG_DEBUG(3,"ramdl_enable, exeaddr=0x%08lx\n", exeaddr); /* Call the download(1,addr) function */ lowaddr = HFA384x_ADDR_CMD_MKOFF(exeaddr); @@ -2576,7 +2576,7 @@ hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr) /* Set the download state */ hw->dlstate = HFA384x_DLSTATE_RAMENABLED; } else { - WLAN_LOG_DEBUG3(1, + WLAN_LOG_DEBUG(1, "cmd_download(0x%04x, 0x%04x) failed, result=%d.\n", lowaddr, hiaddr, @@ -2631,7 +2631,7 @@ hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len) return -EINVAL; } - WLAN_LOG_INFO2("Writing %ld bytes to ram @0x%06lx\n", len, daddr); + WLAN_LOG_INFO("Writing %ld bytes to ram @0x%06lx\n", len, daddr); /* How many dowmem calls? */ nwrites = len / HFA384x_USB_RWMEM_MAXLEN; @@ -2735,7 +2735,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) NULL, NULL); if (result) { - WLAN_LOG_WARNING1( + WLAN_LOG_WARNING( "Read from index %d failed, continuing\n", i ); if ( i >= (sizeof(pdaloc)/sizeof(pdaloc[0])) ){ @@ -2753,14 +2753,14 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) pdrcode = hfa384x2host_16(pda[currpdr+1]); /* Test the record length */ if ( pdrlen > HFA384x_PDR_LEN_MAX || pdrlen == 0) { - WLAN_LOG_ERROR1("pdrlen invalid=%d\n", + WLAN_LOG_ERROR("pdrlen invalid=%d\n", pdrlen); pdaok = 0; break; } /* Test the code */ if ( !hfa384x_isgood_pdrcode(pdrcode) ) { - WLAN_LOG_ERROR1("pdrcode invalid=%d\n", + WLAN_LOG_ERROR("pdrcode invalid=%d\n", pdrcode); pdaok = 0; break; @@ -2777,7 +2777,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) } } if ( pdaok ) { - WLAN_LOG_DEBUG2(2, + WLAN_LOG_DEBUG(2, "PDA Read from 0x%08lx in %s space.\n", pdaloc[i].cardaddr, pdaloc[i].auxctl == 0 ? "EXTDS" : @@ -2991,7 +2991,7 @@ int hfa384x_drvr_start(hfa384x_t *hw) hw->rx_urb.transfer_flags |= USB_ASYNC_UNLINK; if ((result = usb_submit_urb(&hw->rx_urb))) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "Fatal, usb_submit_urb() failed, result=%d\n", result); goto done; @@ -3004,7 +3004,7 @@ int hfa384x_drvr_start(hfa384x_t *hw) if (result != 0) { usb_unlink_urb(&hw->rx_urb); hw->rxurb_posted = 0; - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "cmd_initialize() failed, result=%d\n", result); goto done; @@ -3175,7 +3175,7 @@ int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, p80211_hdr_t *p8021 hw->tx_urb.transfer_flags |= USB_QUEUE_BULK; if ( (result = usb_submit_urb(&hw->tx_urb)) ) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "submit_urb() failed, result=%d\n", result); #if 0 hw->usbflags &= ~HFA384x_USBFLAG_TXURB_BUSY; @@ -3218,7 +3218,7 @@ hfa384x_rx_typedrop( wlandevice_t *wlandev, UINT16 fc) ftype = WLAN_GET_FC_FTYPE(fc); fstype = WLAN_GET_FC_FSTYPE(fc); #if 0 - WLAN_LOG_DEBUG2(4, + WLAN_LOG_DEBUG(4, "rx_typedrop : ftype=%d fstype=%d.\n", ftype, fstype); #endif switch ( ftype ) { @@ -3437,7 +3437,7 @@ void hfa384x_usbctlx_complete(hfa384x_usbctlx_t *ctlx) hfa384x_cbrmem(hw, ctlx); break; default: - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "unknown reqtype=%d, ignored.\n", ctlx->outbuf.type); kfree(ctlx); @@ -3604,7 +3604,7 @@ hfa384x_usbctlxq_run( head->state == HFA384x_USBCTLX_QUEUED) { result = usb_submit_urb(&head->outurb); if (result) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "Fatal, failed to submit command urb. error=%d\n", result); head->state = HFA384x_USBCTLX_REQSUBMIT_FAIL; @@ -3694,15 +3694,15 @@ void hfa384x_usbin_callback(struct urb *urb) break; case -EILSEQ: case -ENODEV: - WLAN_LOG_DEBUG1(3,"status=%d, device removed.\n", urb->status); + WLAN_LOG_DEBUG(3,"status=%d, device removed.\n", urb->status); return; break; case -ENOENT: - WLAN_LOG_DEBUG1(3,"status=%d, urb explicitly unlinked.\n", urb->status); + WLAN_LOG_DEBUG(3,"status=%d, urb explicitly unlinked.\n", urb->status); return; break; default: - WLAN_LOG_DEBUG1(3,"urb errstatus=%d\n", urb->status); + WLAN_LOG_DEBUG(3,"urb errstatus=%d\n", urb->status); goto resubmit; break; } @@ -3744,17 +3744,17 @@ handle: goto resubmit; break; case HFA384x_USB_BUFAVAIL: - WLAN_LOG_DEBUG1(3,"Received BUFAVAIL packet, frmlen=%d\n", + WLAN_LOG_DEBUG(3,"Received BUFAVAIL packet, frmlen=%d\n", usbin->bufavail.frmlen); goto resubmit; break; case HFA384x_USB_ERROR: - WLAN_LOG_DEBUG1(3,"Received USB_ERROR packet, errortype=%d\n", + WLAN_LOG_DEBUG(3,"Received USB_ERROR packet, errortype=%d\n", usbin->usberror.errortype); goto resubmit; break; default: - WLAN_LOG_DEBUG1(3,"Unrecognized USBIN packet, type=%x\n", + WLAN_LOG_DEBUG(3,"Unrecognized USBIN packet, type=%x\n", usbin->type); goto resubmit; } @@ -3766,7 +3766,7 @@ resubmit: hfa384x_usbin_callback, hw->usbcontext); if ((result = usb_submit_urb(&(hw->rx_urb)))) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "Fatal, failed to resubmit rx_urb. error=%d\n", result); goto exit; @@ -3967,7 +3967,7 @@ void hfa384x_usbin_rx(wlandevice_t *wlandev, hfa384x_usbin_t *usbin) result = hfa384x_rx_typedrop(wlandev, ieee2host16(usbin->rxfrm.desc.frame_control)); if (result) { if (result != 1) - WLAN_LOG_WARNING1("Invalid frame type, fc=%04x, dropped.\n",w_hdr->a3.fc); + WLAN_LOG_WARNING("Invalid frame type, fc=%04x, dropped.\n",w_hdr->a3.fc); goto done; } @@ -4052,7 +4052,7 @@ void hfa384x_usbin_rx(wlandevice_t *wlandev, hfa384x_usbin_t *usbin) break; default: - WLAN_LOG_WARNING1("Received frame on unsupported port=%d\n", + WLAN_LOG_WARNING("Received frame on unsupported port=%d\n", HFA384x_RXSTATUS_MACPORT_GET(usbin->rxfrm.desc.status) ); goto done; break; @@ -4133,7 +4133,7 @@ static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *r datalen = 0; break; default: - WLAN_LOG_DEBUG1(1, "unknown frm: fc=0x%04x\n", fc); + WLAN_LOG_DEBUG(1, "unknown frm: fc=0x%04x\n", fc); return; } @@ -4145,12 +4145,12 @@ static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *r if ( skblen > (sizeof(p80211msg_lnxind_wlansniffrm_t) + WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) { - WLAN_LOG_DEBUG1(1, "overlen frm: len=%d\n", + WLAN_LOG_DEBUG(1, "overlen frm: len=%d\n", skblen - sizeof(p80211msg_lnxind_wlansniffrm_t)); } if ( (skb = dev_alloc_skb(skblen)) == NULL ) { - WLAN_LOG_ERROR1("alloc_skb failed trying to allocate %d bytes\n", skblen); + WLAN_LOG_ERROR("alloc_skb failed trying to allocate %d bytes\n", skblen); return; } @@ -4332,7 +4332,7 @@ void hfa384x_usbout_callback(struct urb *urb) hfa384x_usbctlx_t *ctlx; DBFENTER; - WLAN_LOG_DEBUG1(3,"urb->status=%d\n", urb->status); + WLAN_LOG_DEBUG(3,"urb->status=%d\n", urb->status); #if 0 void dbprint_urb(struct urb* urb); #endif @@ -4453,7 +4453,7 @@ void hfa384x_usbout_callback(struct urb *urb) break; default: - WLAN_LOG_DEBUG1(3,"Unrecognized USBOUT packet, type=%x\n", + WLAN_LOG_DEBUG(3,"Unrecognized USBOUT packet, type=%x\n", usbout->type); break; } @@ -4843,14 +4843,14 @@ hfa384x_isgood_pdrcode(UINT16 pdrcode) default: if ( pdrcode < 0x1000 ) { /* code is OK, but we don't know exactly what it is */ - WLAN_LOG_DEBUG1(3, + WLAN_LOG_DEBUG(3, "Encountered unknown PDR#=0x%04x, " "assuming it's ok.\n", pdrcode); return 1; } else { /* bad code */ - WLAN_LOG_DEBUG1(3, + WLAN_LOG_DEBUG(3, "Encountered unknown PDR#=0x%04x, " "(>=0x1000), assuming it's bad.\n", pdrcode); diff --git a/src/prism2/driver/prism2mgmt.c b/src/prism2/driver/prism2mgmt.c index bff5bf0..380b974 100644 --- a/src/prism2/driver/prism2mgmt.c +++ b/src/prism2/driver/prism2mgmt.c @@ -257,7 +257,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_CNFROAMINGMODE, &roamingmode); if ( result ) { - WLAN_LOG_ERROR1("getconfig(ROAMMODE) failed. result=%d\n", + WLAN_LOG_ERROR("getconfig(ROAMMODE) failed. result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -269,7 +269,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE, &word); if ( result ) { - WLAN_LOG_ERROR1("setconfig(ROAMINGMODE) failed. result=%d\n", + WLAN_LOG_ERROR("setconfig(ROAMINGMODE) failed. result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -314,7 +314,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) /* Enable the MAC port if it's not already enabled */ result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_PORTSTATUS, &word); if ( result ) { - WLAN_LOG_ERROR1("getconfig(PORTSTATUS) failed. " + WLAN_LOG_ERROR("getconfig(PORTSTATUS) failed. " "result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -327,7 +327,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE, &word); if ( result ) { - WLAN_LOG_ERROR1("setconfig(ROAMINGMODE) failed. result=%d\n", result); + WLAN_LOG_ERROR("setconfig(ROAMINGMODE) failed. result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; goto exit; @@ -375,7 +375,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) } result = hfa384x_drvr_enable(hw, 0); if ( result ) { - WLAN_LOG_ERROR1("drvr_enable(0) failed. " + WLAN_LOG_ERROR("drvr_enable(0) failed. " "result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -397,7 +397,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) HFA384x_RID_HOSTSCAN, &scanreq, sizeof(hfa384x_HostScanRequest_data_t)); if ( result ) { - WLAN_LOG_ERROR1("setconfig(SCANREQUEST) failed. result=%d\n", + WLAN_LOG_ERROR("setconfig(SCANREQUEST) failed. result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -419,7 +419,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) if (istmpenable) { result = hfa384x_drvr_disable(hw, 0); if ( result ) { - WLAN_LOG_ERROR1("drvr_disable(0) failed. " + WLAN_LOG_ERROR("drvr_disable(0) failed. " "result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -431,7 +431,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE, &roamingmode); if ( result ) { - WLAN_LOG_ERROR1("setconfig(ROAMMODE) failed. result=%d\n", + WLAN_LOG_ERROR("setconfig(ROAMMODE) failed. result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -500,7 +500,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp) count = (hfa384x2host_16(priv->scanresults->framelen) - 3) / 32; if (req->bssindex.data > count) { - WLAN_LOG_ERROR2("reqeusted index (%ld) out of range (%d)\n", + WLAN_LOG_ERROR("reqeusted index (%ld) out of range (%d)\n", req->bssindex.data, count); result = 2; req->resultcode.data = P80211ENUM_resultcode_invalid_parameters; @@ -761,7 +761,7 @@ int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp) reg = 0x03; result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, ®); if ( result ) { - WLAN_LOG_ERROR1("Failed to set basicrates=%d.\n", reg); + WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", reg); goto failed; } @@ -795,13 +795,13 @@ int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp) reg = 0x0f; result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, ®); if ( result ) { - WLAN_LOG_ERROR1("Failed to set supprates=%d.\n", reg); + WLAN_LOG_ERROR("Failed to set supprates=%d.\n", reg); goto failed; } result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, ®); if ( result ) { - WLAN_LOG_ERROR1("Failed to set txrates=%d.\n", reg); + WLAN_LOG_ERROR("Failed to set txrates=%d.\n", reg); goto failed; } @@ -820,7 +820,7 @@ int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp) /* Enable the Port */ result = hfa384x_cmd_enable(hw, 0); if ( result ) { - WLAN_LOG_ERROR1("Enable macport failed, result=%d.\n", result); + WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result); goto failed; } @@ -835,7 +835,7 @@ int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp) HFA384x_RID_JOINREQUEST, &joinreq, HFA384x_RID_JOINREQUEST_LEN); if(result != 0) { - WLAN_LOG_ERROR1("Join request failed, result=%d.\n", result); + WLAN_LOG_ERROR("Join request failed, result=%d.\n", result); goto failed; } if (priv->log) { @@ -860,7 +860,7 @@ int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp) goto done; failed: - WLAN_LOG_DEBUG1(1, "Failed to set a config option, result=%d\n", result); + WLAN_LOG_DEBUG(1, "Failed to set a config option, result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters; done: @@ -1175,7 +1175,7 @@ int prism2mgmt_reset(wlandevice_t *wlandev, void *msgp) if ( msgp ) { msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.data = P80211ENUM_resultcode_success; - WLAN_LOG_INFO0("dot11req_reset: the macaddress and " + WLAN_LOG_INFO("dot11req_reset: the macaddress and " "setdefaultmib arguments are currently unsupported.\n"); } @@ -1270,7 +1270,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) word = msg->beaconperiod.data; result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNINT, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set beacon period=%d.\n", word); + WLAN_LOG_ERROR("Failed to set beacon period=%d.\n", word); goto failed; } @@ -1278,7 +1278,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) word = msg->dschannel.data; result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFOWNCHANNEL, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set channel=%d.\n", word); + WLAN_LOG_ERROR("Failed to set channel=%d.\n", word); goto failed; } /* Basic rates */ @@ -1306,7 +1306,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) } result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set basicrates=%d.\n", word); + WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", word); goto failed; } @@ -1335,13 +1335,13 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) } result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set supprates=%d.\n", word); + WLAN_LOG_ERROR("Failed to set supprates=%d.\n", word); goto failed; } result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set txrates=%d.\n", word); + WLAN_LOG_ERROR("Failed to set txrates=%d.\n", word); goto failed; } @@ -1355,7 +1355,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) /* Enable the Port */ result = hfa384x_drvr_enable(hw, 0); if ( result ) { - WLAN_LOG_ERROR1("Enable macport failed, result=%d.\n", result); + WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result); goto failed; } @@ -1389,7 +1389,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFOWNSSID, bytebuf, HFA384x_RID_CNFOWNSSID_LEN); if ( result ) { - WLAN_LOG_ERROR1("Failed to set SSID, result=0x%04x\n", result); + WLAN_LOG_ERROR("Failed to set SSID, result=0x%04x\n", result); goto failed; } @@ -1399,7 +1399,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) word = msg->beaconperiod.data; result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNINT, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set beacon period=%d.\n", word); + WLAN_LOG_ERROR("Failed to set beacon period=%d.\n", word); goto failed; } @@ -1407,7 +1407,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) word = msg->dschannel.data; result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFOWNCHANNEL, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set channel=%d.\n", word); + WLAN_LOG_ERROR("Failed to set channel=%d.\n", word); goto failed; } /* Basic rates */ @@ -1435,7 +1435,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) } result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set basicrates=%d.\n", word); + WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", word); goto failed; } @@ -1464,18 +1464,18 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) } result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set supprates=%d.\n", word); + WLAN_LOG_ERROR("Failed to set supprates=%d.\n", word); goto failed; } result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL0, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set txrates=%d.\n", word); + WLAN_LOG_ERROR("Failed to set txrates=%d.\n", word); goto failed; } /* ibssatimwindow */ if (msg->ibssatimwindow.status == P80211ENUM_msgitem_status_data_ok) { - WLAN_LOG_INFO0("prism2mgmt_start: atimwindow not used in " + WLAN_LOG_INFO("prism2mgmt_start: atimwindow not used in " "Infrastructure mode, ignored.\n"); } @@ -1483,13 +1483,13 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) word = msg->dtimperiod.data; result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFOWNDTIMPER, &word); if ( result ) { - WLAN_LOG_ERROR1("Failed to set dtim period=%d.\n", word); + WLAN_LOG_ERROR("Failed to set dtim period=%d.\n", word); goto failed; } /* probedelay */ if (msg->probedelay.status == P80211ENUM_msgitem_status_data_ok) { - WLAN_LOG_INFO0("prism2mgmt_start: probedelay not " + WLAN_LOG_INFO("prism2mgmt_start: probedelay not " "supported in prism2, ignored.\n"); } @@ -1505,7 +1505,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CNFAPPCFINFO, pcfinfo, HFA384x_RID_CNFAPPCFINFO_LEN); if ( result ) { - WLAN_LOG_INFO0("prism2mgmt_start: read(pcfinfo) failed, " + WLAN_LOG_INFO("prism2mgmt_start: read(pcfinfo) failed, " "assume it's " "not supported, pcf settings ignored.\n"); goto pcf_skip; @@ -1562,7 +1562,7 @@ pcf_skip: /* Enable the Port */ result = hfa384x_drvr_enable(hw, 0); if ( result ) { - WLAN_LOG_ERROR1("Enable macport failed, result=%d.\n", result); + WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result); goto failed; } @@ -1575,7 +1575,7 @@ pcf_skip: goto done; failed: - WLAN_LOG_DEBUG1(1, "Failed to set a config option, result=%d\n", result); + WLAN_LOG_DEBUG(1, "Failed to set a config option, result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters; done: @@ -1642,7 +1642,7 @@ int prism2mgmt_enable(wlandevice_t *wlandev, void *msgp) /* Enable the Port */ result = hfa384x_drvr_enable(hw, 0); if ( result ) { - WLAN_LOG_ERROR1("Enable macport failed, result=%d.\n", result); + WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result); goto failed; } @@ -1711,7 +1711,7 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp) msg->pda.data, HFA384x_PDA_LEN_MAX); if (result) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "hfa384x_drvr_readpda() failed, " "result=%d\n", result); @@ -1764,7 +1764,7 @@ int prism2mgmt_readcis(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CIS, msg->cis.data, HFA384x_RID_CIS_LEN); if ( result ) { - WLAN_LOG_INFO0("prism2mgmt_readcis: read(cis) failed.\n"); + WLAN_LOG_INFO("prism2mgmt_readcis: read(cis) failed.\n"); msg->cis.status = P80211ENUM_msgitem_status_no_value; msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -2332,7 +2332,7 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp) wlandev->msdstate = WLAN_MSD_HWPRESENT; result = prism2sta_ifstate(wlandev, P80211ENUM_ifstate_fwload); if (result != P80211ENUM_resultcode_success) { - WLAN_LOG_ERROR1("prism2sta_ifstate(fwload) failed," + WLAN_LOG_ERROR("prism2sta_ifstate(fwload) failed," "P80211ENUM_resultcode=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -2443,7 +2443,7 @@ int prism2mgmt_dump_state(wlandevice_t *wlandev, void *msgp) WLAN_LOG_NOTICE0("prism2 driver and hardware state:\n"); if ( (result = hfa384x_cmd_aux_enable(hw)) ) { - WLAN_LOG_ERROR1("aux_enable failed, result=%d\n", result); + WLAN_LOG_ERROR("aux_enable failed, result=%d\n", result); goto failed; } hfa384x_copy_from_aux(hw, @@ -2452,16 +2452,16 @@ int prism2mgmt_dump_state(wlandevice_t *wlandev, void *msgp) auxbuf, sizeof(auxbuf)); hfa384x_cmd_aux_disable(hw); - WLAN_LOG_NOTICE1(" cmac: FreeBlocks=%d\n", auxbuf[5]); - WLAN_LOG_NOTICE2(" cmac: IntEn=0x%02x EvStat=0x%02x\n", + WLAN_LOG_NOTICE(" cmac: FreeBlocks=%d\n", auxbuf[5]); + WLAN_LOG_NOTICE(" cmac: IntEn=0x%02x EvStat=0x%02x\n", hfa384x_getreg(hw, HFA384x_INTEN), hfa384x_getreg(hw, HFA384x_EVSTAT)); #ifdef USE_FID_STACK - WLAN_LOG_NOTICE2(" drvr: txfid_top=%d stacksize=%d\n", + WLAN_LOG_NOTICE(" drvr: txfid_top=%d stacksize=%d\n", hw->txfid_top,HFA384x_DRVR_FIDSTACKLEN_MAX); #else - WLAN_LOG_NOTICE3(" drvr: txfid_head=%d txfid_tail=%d txfid_N=%d\n", + WLAN_LOG_NOTICE(" drvr: txfid_head=%d txfid_tail=%d txfid_N=%d\n", hw->txfid_head, hw->txfid_tail, hw->txfid_N); #endif @@ -2551,7 +2551,7 @@ int prism2mgmt_channel_info(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CHANNELINFOREQUEST, &chinforeq, HFA384x_RID_CHANNELINFOREQUEST_LEN); if ( result ) { - WLAN_LOG_ERROR1("setconfig(CHANNELINFOREQUEST) failed. result=%d\n", + WLAN_LOG_ERROR("setconfig(CHANNELINFOREQUEST) failed. result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_not_supported; goto done; @@ -2560,7 +2560,7 @@ int prism2mgmt_channel_info(wlandevice_t *wlandev, void *msgp) now = jiffies; while (atomic_read(&priv->channel_info.done) != 1) { if ((jiffies - now) > CHINFO_TIMEOUT*HZ) { - WLAN_LOG_NOTICE1("ChannelInfo results not received in %d seconds, aborting.\n", + WLAN_LOG_NOTICE("ChannelInfo results not received in %d seconds, aborting.\n", CHINFO_TIMEOUT); msg->resultcode.data = P80211ENUM_resultcode_timeout; goto done; @@ -2629,7 +2629,7 @@ int prism2mgmt_channel_info_results(wlandevice_t *wlandev, void *msgp) msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters; goto done; } - WLAN_LOG_DEBUG4(2, "chinfo_results: channel %d, avg/peak level=%d/%d dB, active=%d\n", + WLAN_LOG_DEBUG(2, "chinfo_results: channel %d, avg/peak level=%d/%d dB, active=%d\n", channel+1, priv->channel_info.results.result[channel].anl, priv->channel_info.results.result[channel].pnl, @@ -2800,7 +2800,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) /* Disable monitor mode */ result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_DISABLE); if ( result ) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "failed to disable monitor mode, result=%d\n", result); goto failed; @@ -2808,7 +2808,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) /* Disable port 0 */ result = hfa384x_drvr_disable(hw, 0); if ( result ) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "failed to disable port 0 after sniffing, result=%d\n", result); goto failed; @@ -2821,7 +2821,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) HFA384x_RID_CNFWEPFLAGS, &(priv->presniff_wepflags)); if ( result ) { - WLAN_LOG_DEBUG2(1, + WLAN_LOG_DEBUG(1, "failed to restore wepflags=0x%04x, result=%d\n", word, result); @@ -2834,7 +2834,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, &word); if ( result ) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "failed to restore porttype, result=%d\n", result); goto failed; @@ -2843,7 +2843,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) /* Enable the port */ result = hfa384x_drvr_enable(hw, 0); if ( result ) { - WLAN_LOG_DEBUG1(1, "failed to enable port to presniff setting, result=%d\n", result); + WLAN_LOG_DEBUG(1, "failed to enable port to presniff setting, result=%d\n", result); goto failed; } } else { @@ -2851,7 +2851,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) } - WLAN_LOG_INFO0("monitor mode disabled\n"); + WLAN_LOG_INFO("monitor mode disabled\n"); msg->resultcode.data = P80211ENUM_resultcode_success; result = 0; goto exit; @@ -2864,7 +2864,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) HFA384x_RID_CNFPORTTYPE, &(priv->presniff_port_type)); if ( result ) { - WLAN_LOG_DEBUG1(1,"failed to read porttype, result=%d\n", result); + WLAN_LOG_DEBUG(1,"failed to read porttype, result=%d\n", result); goto failed; } /* Save the wepflags state */ @@ -2872,12 +2872,12 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) HFA384x_RID_CNFWEPFLAGS, &(priv->presniff_wepflags)); if ( result ) { - WLAN_LOG_DEBUG1(1,"failed to read wepflags, result=%d\n", result); + WLAN_LOG_DEBUG(1,"failed to read wepflags, result=%d\n", result); goto failed; } result = hfa384x_drvr_disable(hw, 0); if ( result ) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "failed to clear port 0 for sniffing, result=%d\n", result); goto failed; @@ -2899,7 +2899,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) } if ( result ) { - WLAN_LOG_DEBUG2(1, + WLAN_LOG_DEBUG(1, "failed to set channel %d, result=%d\n", word, result); @@ -2910,7 +2910,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, &word); if ( result ) { - WLAN_LOG_DEBUG2(1, + WLAN_LOG_DEBUG(1, "failed to set porttype %d, result=%d\n", word, result); @@ -2924,7 +2924,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) } if ( result ) { - WLAN_LOG_DEBUG2(1, + WLAN_LOG_DEBUG(1, "failed to set wepflags=0x%04x, result=%d\n", word, result); @@ -2948,7 +2948,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) /* Enable the port */ result = hfa384x_drvr_enable(hw, 0); if ( result ) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "failed to enable port for sniffing, result=%d\n", result); goto failed; @@ -2956,14 +2956,14 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) /* Enable monitor mode */ result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_ENABLE); if ( result ) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "failed to enable monitor mode, result=%d\n", result); goto failed; } if (wlandev->netdev->type == ARPHRD_ETHER) { - WLAN_LOG_INFO0("monitor mode enabled\n"); + WLAN_LOG_INFO("monitor mode enabled\n"); } /* Set the driver state */ diff --git a/src/prism2/driver/prism2mib.c b/src/prism2/driver/prism2mib.c index bd1ab4f..7747014 100644 --- a/src/prism2/driver/prism2mib.c +++ b/src/prism2/driver/prism2mib.c @@ -1523,7 +1523,7 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp) if (msg->resultcode.data == P80211ENUM_resultcode_success) { if (result != 0) { - WLAN_LOG_DEBUG1(1, "get/set failure, result=%d\n", + WLAN_LOG_DEBUG(1, "get/set failure, result=%d\n", result); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; @@ -2701,7 +2701,7 @@ void *data) result = hfa384x_drvr_getconfig16( hw, HFA384x_RID_CNFAUTHENTICATION, &cnf_auth); - WLAN_LOG_DEBUG2(2,"cnfAuthentication0=%d, index=%d\n", cnf_auth, index); + WLAN_LOG_DEBUG(2,"cnfAuthentication0=%d, index=%d\n", cnf_auth, index); if (isget) { if ( index == 0 || index == 1 ) { @@ -2721,9 +2721,9 @@ void *data) } result = hfa384x_drvr_setconfig16( hw, HFA384x_RID_CNFAUTHENTICATION, &cnf_auth); - WLAN_LOG_DEBUG1(2,"cnfAuthentication:=%d\n", cnf_auth); + WLAN_LOG_DEBUG(2,"cnfAuthentication:=%d\n", cnf_auth); if ( result ) { - WLAN_LOG_DEBUG1(1,"Unable to set p2cnfAuthentication to %d\n", cnf_auth); + WLAN_LOG_DEBUG(1,"Unable to set p2cnfAuthentication to %d\n", cnf_auth); msg->resultcode.data = P80211ENUM_resultcode_implementation_failure; } } else { @@ -3687,7 +3687,7 @@ void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr) *rate |= BIT3; break; default: - WLAN_LOG_DEBUG1(1, "Unrecoginzed Rate of %d\n", + WLAN_LOG_DEBUG(1, "Unrecoginzed Rate of %d\n", *datarate); break; } diff --git a/src/prism2/driver/prism2sta.c b/src/prism2/driver/prism2sta.c index a63cd7d..a4b3ba7 100644 --- a/src/prism2/driver/prism2sta.c +++ b/src/prism2/driver/prism2sta.c @@ -1134,7 +1134,7 @@ int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg) &qual, HFA384x_RID_COMMSQUALITY_LEN); if (result != 0) { - WLAN_LOG_ERROR2("Failed to read %s statistics: error=%d\n", + WLAN_LOG_ERROR("Failed to read %s statistics: error=%d\n", wlandev->name, result); break; } @@ -1156,7 +1156,7 @@ int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg) break; } default: - WLAN_LOG_WARNING1("Unknown mgmt request message 0x%08lx", msg->msgcode); + WLAN_LOG_WARNING("Unknown mgmt request message 0x%08lx", msg->msgcode); break; } @@ -1210,7 +1210,7 @@ UINT32 prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate) */ #if (WLAN_HOSTIF != WLAN_USB) if ((result=hfa384x_cmd_initialize(hw))) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "hfa384x_cmd_initialize() failed," "result=%d\n", (int)result); result = @@ -1220,7 +1220,7 @@ UINT32 prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate) } #else if ((result=hfa384x_drvr_start(hw))) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "hfa384x_drvr_start() failed," "result=%d\n", (int)result); result = @@ -1265,7 +1265,7 @@ UINT32 prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate) * of the hardware or a previous firmware load. */ if ((result=hfa384x_drvr_start(hw))) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "hfa384x_drvr_start() failed," "result=%d\n", (int)result); result = @@ -1275,7 +1275,7 @@ UINT32 prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate) } if ((result=prism2sta_getcardinfo(wlandev))) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "prism2sta_getcardinfo() failed," "result=%d\n", (int)result); result = @@ -1285,7 +1285,7 @@ UINT32 prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate) break; } if ((result=prism2sta_globalsetup(wlandev))) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "prism2sta_globalsetup() failed," "result=%d\n", (int)result); result = @@ -1409,7 +1409,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->ident_nic.major = hfa384x2host_16(priv->ident_nic.major); priv->ident_nic.minor = hfa384x2host_16(priv->ident_nic.minor); - WLAN_LOG_INFO4( "ident: nic h/w: id=0x%02x %d.%d.%d\n", + WLAN_LOG_INFO( "ident: nic h/w: id=0x%02x %d.%d.%d\n", priv->ident_nic.id, priv->ident_nic.major, priv->ident_nic.minor, priv->ident_nic.variant); @@ -1427,7 +1427,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->ident_pri_fw.major = hfa384x2host_16(priv->ident_pri_fw.major); priv->ident_pri_fw.minor = hfa384x2host_16(priv->ident_pri_fw.minor); - WLAN_LOG_INFO4( "ident: pri f/w: id=0x%02x %d.%d.%d\n", + WLAN_LOG_INFO( "ident: pri f/w: id=0x%02x %d.%d.%d\n", priv->ident_pri_fw.id, priv->ident_pri_fw.major, priv->ident_pri_fw.minor, priv->ident_pri_fw.variant); @@ -1451,13 +1451,13 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) if ( priv->ident_sta_fw.id == 0x1f ) { priv->ap = 0; - WLAN_LOG_INFO4( + WLAN_LOG_INFO( "ident: sta f/w: id=0x%02x %d.%d.%d\n", priv->ident_sta_fw.id, priv->ident_sta_fw.major, priv->ident_sta_fw.minor, priv->ident_sta_fw.variant); } else { priv->ap = 1; - WLAN_LOG_INFO4( + WLAN_LOG_INFO( "ident: ap f/w: id=0x%02x %d.%d.%d\n", priv->ident_sta_fw.id, priv->ident_sta_fw.major, priv->ident_sta_fw.minor, priv->ident_sta_fw.variant); @@ -1479,7 +1479,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->cap_sup_mfi.bottom = hfa384x2host_16(priv->cap_sup_mfi.bottom); priv->cap_sup_mfi.top = hfa384x2host_16(priv->cap_sup_mfi.top); - WLAN_LOG_INFO5( + WLAN_LOG_INFO( "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", priv->cap_sup_mfi.role, priv->cap_sup_mfi.id, priv->cap_sup_mfi.variant, priv->cap_sup_mfi.bottom, @@ -1501,7 +1501,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->cap_sup_cfi.bottom = hfa384x2host_16(priv->cap_sup_cfi.bottom); priv->cap_sup_cfi.top = hfa384x2host_16(priv->cap_sup_cfi.top); - WLAN_LOG_INFO5( + WLAN_LOG_INFO( "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", priv->cap_sup_cfi.role, priv->cap_sup_cfi.id, priv->cap_sup_cfi.variant, priv->cap_sup_cfi.bottom, @@ -1523,7 +1523,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->cap_sup_pri.bottom = hfa384x2host_16(priv->cap_sup_pri.bottom); priv->cap_sup_pri.top = hfa384x2host_16(priv->cap_sup_pri.top); - WLAN_LOG_INFO5( + WLAN_LOG_INFO( "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", priv->cap_sup_pri.role, priv->cap_sup_pri.id, priv->cap_sup_pri.variant, priv->cap_sup_pri.bottom, @@ -1546,13 +1546,13 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->cap_sup_sta.top = hfa384x2host_16(priv->cap_sup_sta.top); if ( priv->cap_sup_sta.id == 0x04 ) { - WLAN_LOG_INFO5( + WLAN_LOG_INFO( "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", priv->cap_sup_sta.role, priv->cap_sup_sta.id, priv->cap_sup_sta.variant, priv->cap_sup_sta.bottom, priv->cap_sup_sta.top); } else { - WLAN_LOG_INFO5( + WLAN_LOG_INFO( "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", priv->cap_sup_sta.role, priv->cap_sup_sta.id, priv->cap_sup_sta.variant, priv->cap_sup_sta.bottom, @@ -1575,7 +1575,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->cap_act_pri_cfi.bottom = hfa384x2host_16(priv->cap_act_pri_cfi.bottom); priv->cap_act_pri_cfi.top = hfa384x2host_16(priv->cap_act_pri_cfi.top); - WLAN_LOG_INFO5( + WLAN_LOG_INFO( "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", priv->cap_act_pri_cfi.role, priv->cap_act_pri_cfi.id, priv->cap_act_pri_cfi.variant, priv->cap_act_pri_cfi.bottom, @@ -1597,7 +1597,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->cap_act_sta_cfi.bottom = hfa384x2host_16(priv->cap_act_sta_cfi.bottom); priv->cap_act_sta_cfi.top = hfa384x2host_16(priv->cap_act_sta_cfi.top); - WLAN_LOG_INFO5( + WLAN_LOG_INFO( "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", priv->cap_act_sta_cfi.role, priv->cap_act_sta_cfi.id, priv->cap_act_sta_cfi.variant, priv->cap_act_sta_cfi.bottom, @@ -1619,7 +1619,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) priv->cap_act_sta_mfi.bottom = hfa384x2host_16(priv->cap_act_sta_mfi.bottom); priv->cap_act_sta_mfi.top = hfa384x2host_16(priv->cap_act_sta_mfi.top); - WLAN_LOG_INFO5( + WLAN_LOG_INFO( "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", priv->cap_act_sta_mfi.role, priv->cap_act_sta_mfi.id, priv->cap_act_sta_mfi.variant, priv->cap_act_sta_mfi.bottom, @@ -1631,7 +1631,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) if ( !result ) { wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN, pstr, sizeof(pstr)); - WLAN_LOG_INFO1("Prism2 card SN: %s\n", pstr); + WLAN_LOG_INFO("Prism2 card SN: %s\n", pstr); } else { WLAN_LOG_ERROR0("Failed to retrieve Prism2 Card SN\n"); goto failed; @@ -1665,7 +1665,7 @@ int prism2sta_getcardinfo(wlandevice_t *wlandev) goto done; failed: - WLAN_LOG_ERROR1("Failed, result=%d\n", result); + WLAN_LOG_ERROR("Failed, result=%d\n", result); done: DBFEXIT; return result; @@ -1819,15 +1819,15 @@ void prism2sta_inf_scanresults(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) nbss /= sizeof(hfa384x_ScanResultSub_t); /* Print em */ - WLAN_LOG_DEBUG2(1,"rx scanresults, reason=%d, nbss=%d:\n", + WLAN_LOG_DEBUG(1,"rx scanresults, reason=%d, nbss=%d:\n", inf->info.scanresult.scanreason, nbss); for ( i = 0; i < nbss; i++) { - WLAN_LOG_DEBUG4(1, "chid=%d anl=%d sl=%d bcnint=%d\n", + WLAN_LOG_DEBUG(1, "chid=%d anl=%d sl=%d bcnint=%d\n", sr->result[i].chid, sr->result[i].anl, sr->result[i].sl, sr->result[i].bcnint); - WLAN_LOG_DEBUG2(1, " capinfo=0x%04x proberesp_rate=%d\n", + WLAN_LOG_DEBUG(1, " capinfo=0x%04x proberesp_rate=%d\n", sr->result[i].capinfo, sr->result[i].proberesp_rate); } @@ -1838,7 +1838,7 @@ void prism2sta_inf_scanresults(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) HFA384x_RID_JOINREQUEST, &joinreq, HFA384x_RID_JOINREQUEST_LEN); if (result) { - WLAN_LOG_ERROR1("setconfig(joinreq) failed, result=%d\n", result); + WLAN_LOG_ERROR("setconfig(joinreq) failed, result=%d\n", result); } DBFEXIT; @@ -1871,7 +1871,7 @@ void prism2sta_inf_hostscanresults(wlandevice_t *wlandev, DBFENTER; nbss = (hfa384x2host_16(inf->framelen) - 3) / 32; - WLAN_LOG_DEBUG1(2, "Received %d hostscan results\n", nbss); + WLAN_LOG_DEBUG(2, "Received %d hostscan results\n", nbss); if (priv->scanresults) kfree(priv->scanresults); @@ -1927,7 +1927,7 @@ void prism2sta_inf_chinforesults(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) chinforesult->anl = hfa384x2host_16(inf->info.chinforesult.result[n].anl); chinforesult->pnl = hfa384x2host_16(inf->info.chinforesult.result[n].pnl); chinforesult->active = hfa384x2host_16(inf->info.chinforesult.result[n].active); - WLAN_LOG_DEBUG5(2, "chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n", + WLAN_LOG_DEBUG(2, "chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n", channel+1, chinforesult->active & HFA384x_CHINFORESULT_BSSACTIVE ? "signal" : "noise", @@ -1960,7 +1960,7 @@ void prism2sta_linkstatus_defer(void *data) * Response: * Block Transmits, Ignore receives of data frames */ - WLAN_LOG_INFO0("linkstatus=NOTCONNECTED (unhandled)\n"); + WLAN_LOG_INFO("linkstatus=NOTCONNECTED (unhandled)\n"); break; case HFA384x_LINK_CONNECTED: @@ -1984,7 +1984,7 @@ void prism2sta_linkstatus_defer(void *data) UINT16 portstatus; int result; - WLAN_LOG_INFO0("linkstatus=CONNECTED\n"); + WLAN_LOG_INFO("linkstatus=CONNECTED\n"); /* For non-usb devices, we can use the sync versions */ /* Collect the BSSID, and set state to allow tx */ @@ -1993,7 +1993,7 @@ void prism2sta_linkstatus_defer(void *data) HFA384x_RID_CURRENTBSSID, wlandev->bssid, WLAN_BSSID_LEN); if ( result ) { - WLAN_LOG_DEBUG2(1, + WLAN_LOG_DEBUG(1, "getconfig(0x%02x) failed, result = %d\n", HFA384x_RID_CURRENTBSSID, result); goto failed; @@ -2003,7 +2003,7 @@ void prism2sta_linkstatus_defer(void *data) result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_PORTSTATUS, &portstatus); if ( result ) { - WLAN_LOG_DEBUG2(1, + WLAN_LOG_DEBUG(1, "getconfig(0x%02x) failed, result = %d\n", HFA384x_RID_PORTSTATUS, result); goto failed; @@ -2033,12 +2033,12 @@ void prism2sta_linkstatus_defer(void *data) hfa384x_drvr_setconfig( hw, HFA384x_RID_JOINREQUEST, &joinreq, HFA384x_RID_JOINREQUEST_LEN); - WLAN_LOG_INFO0("linkstatus=DISCONNECTED (re-submitting join)\n"); + WLAN_LOG_INFO("linkstatus=DISCONNECTED (re-submitting join)\n"); } else { if (wlandev->netdev->type == ARPHRD_ETHER) - WLAN_LOG_INFO0("linkstatus=DISCONNECTED (unhandled)\n"); + WLAN_LOG_INFO("linkstatus=DISCONNECTED (unhandled)\n"); } break; @@ -2058,7 +2058,7 @@ void prism2sta_linkstatus_defer(void *data) * Indicate Reassociation * Enable Transmits, Receives and pass up data frames */ - WLAN_LOG_INFO0("linkstatus=AP_CHANGE (unhandled)\n"); + WLAN_LOG_INFO("linkstatus=AP_CHANGE (unhandled)\n"); break; case HFA384x_LINK_AP_OUTOFRANGE: @@ -2073,7 +2073,7 @@ void prism2sta_linkstatus_defer(void *data) * Response: * Block Transmits, Ignore receives of data frames */ - WLAN_LOG_INFO0("linkstatus=AP_OUTOFRANGE (unhandled)\n"); + WLAN_LOG_INFO("linkstatus=AP_OUTOFRANGE (unhandled)\n"); break; case HFA384x_LINK_AP_INRANGE: @@ -2083,7 +2083,7 @@ void prism2sta_linkstatus_defer(void *data) * Response: * Enable Transmits, Receives and pass up data frames */ - WLAN_LOG_INFO0("linkstatus=AP_INRANGE (unhandled)\n"); + WLAN_LOG_INFO("linkstatus=AP_INRANGE (unhandled)\n"); break; case HFA384x_LINK_ASSOCFAIL: @@ -2103,17 +2103,17 @@ void prism2sta_linkstatus_defer(void *data) hfa384x_drvr_setconfig( hw, HFA384x_RID_JOINREQUEST, &joinreq, HFA384x_RID_JOINREQUEST_LEN); - WLAN_LOG_INFO0("linkstatus=ASSOCFAIL (re-submitting join)\n"); + WLAN_LOG_INFO("linkstatus=ASSOCFAIL (re-submitting join)\n"); } else { - WLAN_LOG_INFO0("linkstatus=ASSOCFAIL (unhandled)\n"); + WLAN_LOG_INFO("linkstatus=ASSOCFAIL (unhandled)\n"); } break; default: /* This is bad, IO port problems? */ - WLAN_LOG_WARNING1( + WLAN_LOG_WARNING( "unknown linkstatus=0x%02x\n", linkstatus); goto failed; break; @@ -2442,7 +2442,7 @@ void prism2sta_inf_authreq( wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) &rec, sizeof(rec)); if (result) { if (added) priv->authlist.cnt--; - WLAN_LOG_ERROR1("setconfig(authenticatestation) failed, result=%d\n", result); + WLAN_LOG_ERROR("setconfig(authenticatestation) failed, result=%d\n", result); } DBFEXIT; @@ -2594,7 +2594,7 @@ void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) WLAN_LOG_WARNING0("Unhandled IT_KEYIDCHANGED\n"); break; default: - WLAN_LOG_WARNING1( + WLAN_LOG_WARNING( "Unknown info type=0x%02x\n", inf->infotype); break; } @@ -2626,7 +2626,7 @@ void prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status) { DBFENTER; - WLAN_LOG_DEBUG1(3, "TxExc status=0x%x.\n", status); + WLAN_LOG_DEBUG(3, "TxExc status=0x%x.\n", status); DBFEXIT; return; @@ -2652,7 +2652,7 @@ void prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status) void prism2sta_ev_tx(wlandevice_t *wlandev, UINT16 status) { DBFENTER; - WLAN_LOG_DEBUG1(4, "Tx Complete, status=0x%04x\n", status); + WLAN_LOG_DEBUG(4, "Tx Complete, status=0x%04x\n", status); /* update linux network stats */ wlandev->linux_stats.tx_packets++; DBFEXIT; @@ -2789,7 +2789,7 @@ dev_link_t *prism2sta_attach(void) link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL); if (!link || ((wlandev = create_wlan()) == NULL)) { - WLAN_LOG_ERROR1("%s: Memory allocation failure.\n", dev_info); + WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info); result = -EIO; goto failed; } @@ -2800,7 +2800,7 @@ dev_link_t *prism2sta_attach(void) memset(link, 0, sizeof(struct dev_link_t)); if ( wlan_setup(wlandev) != 0 ) { - WLAN_LOG_ERROR1("%s: wlan_setup() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info); result = -EIO; goto failed; } @@ -3043,7 +3043,7 @@ void prism2sta_config(dev_link_t *link) /* Lets print out the Vcc that the controller+pcmcia-cs set * for us, cause that's what we're going to use. */ - WLAN_LOG_DEBUG1(1,"Initial Vcc=%d/10v\n", socketconf.Vcc); + WLAN_LOG_DEBUG(1,"Initial Vcc=%d/10v\n", socketconf.Vcc); if (prism2_ignorevcc) { link->conf.Vcc = socketconf.Vcc; goto skipvcc; @@ -3097,7 +3097,7 @@ void prism2sta_config(dev_link_t *link) goto next_entry; } skipvcc: - WLAN_LOG_DEBUG1(1, "link->conf.Vcc=%d\n", link->conf.Vcc); + WLAN_LOG_DEBUG(1, "link->conf.Vcc=%d\n", link->conf.Vcc); /* Do we need to allocate an interrupt? */ /* HACK: due to a bad CIS....we ALWAYS need an interrupt */ @@ -3115,7 +3115,7 @@ skipvcc: link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.BasePort1 = io->win[0].base; if ( link->io.BasePort1 != 0 ) { - WLAN_LOG_WARNING1( + WLAN_LOG_WARNING( "Brain damaged CIS: hard coded iobase=" "0x%x, try letting pcmcia_cs decide...\n", link->io.BasePort1 ); @@ -3251,7 +3251,7 @@ void prism2sta_release(UINT32 arg) /* TODO: I don't think we're even using this bit of code * and I don't think it's hurting us at the moment. */ - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "prism2sta_cs: release postponed, '%s' still open\n", link->dev->dev_name); link->state |= DEV_STALE_CONFIG; @@ -3313,7 +3313,7 @@ prism2sta_event ( prism2sta_config(link); if (!(link->state & DEV_CONFIG)) { wlandev->netdev->irq = 0; - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "%s: Initialization failed!\n", dev_info); wlandev->msdstate = WLAN_MSD_HWFAIL; break; @@ -3330,7 +3330,7 @@ prism2sta_event ( prism2_reset_holdtime, prism2_reset_settletime); if ( result ) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "corereset() failed, result=%d.\n", result); wlandev->msdstate = WLAN_MSD_HWFAIL; @@ -3344,7 +3344,7 @@ prism2sta_event ( */ result = hfa384x_test_hostif(priv->hw); if (result) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "test_hostif() failed, result=%d.\n", result); wlandev->msdstate = WLAN_MSD_HWFAIL; break; @@ -3461,7 +3461,7 @@ prism2sta_probe_pci( /* Enable the pci device */ if (pci_enable_device(pdev)) { - WLAN_LOG_ERROR1("%s: pci_enable_device() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: pci_enable_device() failed.\n", dev_info); result = -EIO; goto fail; } @@ -3477,18 +3477,18 @@ prism2sta_probe_pci( mem = (unsigned long) ioremap(phymem, PCI_SIZE); if ( mem == 0 ) { - WLAN_LOG_ERROR1("%s: ioremap() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: ioremap() failed.\n", dev_info); result = -EIO; goto fail; } /* Log the device */ - WLAN_LOG_INFO3("A Prism2.5 PCI device found, " + WLAN_LOG_INFO("A Prism2.5 PCI device found, " "phymem:0x%lx, irq:%d, mem:0x%lx\n", phymem, pdev->irq, mem); if ((wlandev = create_wlan()) == NULL) { - WLAN_LOG_ERROR1("%s: Memory allocation failure.\n", dev_info); + WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info); result = -EIO; goto fail; } @@ -3496,7 +3496,7 @@ prism2sta_probe_pci( hw = priv->hw; if ( wlan_setup(wlandev) != 0 ) { - WLAN_LOG_ERROR1("%s: wlan_setup() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info); result = -EIO; goto fail; } @@ -3512,7 +3512,7 @@ prism2sta_probe_pci( * linux netdevice. */ if ( register_wlandev(wlandev) != 0 ) { - WLAN_LOG_ERROR1("%s: wlan_setup() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info); result = -EIO; goto fail; } @@ -3542,7 +3542,7 @@ prism2sta_probe_pci( prism2_reset_holdtime, prism2_reset_settletime); if (result != 0) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "%s: hfa384x_corereset() failed.\n", dev_info); unregister_wlandev(wlandev); @@ -3708,14 +3708,14 @@ prism2sta_probe_plx( while (delay > jiffies); if (inb(pccard_ioaddr) != 0x45) { - WLAN_LOG_ERROR1("Initialize the TMC7160 failed. (0x%x)\n", inb(pccard_ioaddr)); + WLAN_LOG_ERROR("Initialize the TMC7160 failed. (0x%x)\n", inb(pccard_ioaddr)); return -EIO; } pccard_ioaddr = pci_resource_start(pdev, 2); prism2_doreset = 0; - WLAN_LOG_INFO2("NDC NCP130 with TMC7160(ASIC) PCI interface device found at io:0x%lx, irq:%d\n", pccard_ioaddr, pdev->irq); + WLAN_LOG_INFO("NDC NCP130 with TMC7160(ASIC) PCI interface device found at io:0x%lx, irq:%d\n", pccard_ioaddr, pdev->irq); goto init; } @@ -3737,14 +3737,14 @@ prism2sta_probe_plx( regic = 0; regic = inl(plx_addr+PLX_INTCSR); if(regic & PLX_INTCSR_INTEN) { - WLAN_LOG_DEBUG1(1, + WLAN_LOG_DEBUG(1, "%s: Local Interrupt already enabled\n", dev_info); } else { regic |= PLX_INTCSR_INTEN; outl(regic, plx_addr+PLX_INTCSR); regic = inl(plx_addr+PLX_INTCSR); if(!(regic & PLX_INTCSR_INTEN)) { - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "%s: Couldn't enable Local Interrupts\n", dev_info); return -EIO; @@ -3755,13 +3755,13 @@ prism2sta_probe_plx( * io space and irq that might be similar to ioremap */ if (!request_mem_region(pccard_attr_mem, pci_resource_len(pdev, 2), "Prism2")) { - WLAN_LOG_ERROR1("%s: Couldn't reserve PCI memory region\n", dev_info); + WLAN_LOG_ERROR("%s: Couldn't reserve PCI memory region\n", dev_info); return -EIO; } attr_mem = ioremap(pccard_attr_mem, pccard_attr_len); - WLAN_LOG_INFO4("A PLX PCI/PCMCIA interface device found, " + WLAN_LOG_INFO("A PLX PCI/PCMCIA interface device found, " "phymem:0x%lx, phyio=0x%lx, irq:%d, " "mem: 0x%lx\n", pccard_attr_mem, pccard_ioaddr, pdev->irq, @@ -3782,7 +3782,7 @@ prism2sta_probe_plx( return -EIO; } - WLAN_LOG_INFO0("A PCMCIA WLAN adapter was found.\n"); + WLAN_LOG_INFO("A PCMCIA WLAN adapter was found.\n"); /* Write COR to enable PC card */ attr_mem[COR_OFFSET] = COR_VALUE; reg = attr_mem[COR_OFFSET]; @@ -3796,7 +3796,7 @@ prism2sta_probe_plx( */ if ((wlandev = create_wlan()) == NULL) { - WLAN_LOG_ERROR1("%s: Memory allocation failure.\n", dev_info); + WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info); result = -EIO; goto failed; } @@ -3805,7 +3805,7 @@ prism2sta_probe_plx( hw = priv->hw; if ( wlan_setup(wlandev) != 0 ) { - WLAN_LOG_ERROR1("%s: wlan_setup() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info); result = -EIO; goto failed; } @@ -3821,7 +3821,7 @@ prism2sta_probe_plx( * linux netdevice. */ if ( register_wlandev(wlandev) != 0 ) { - WLAN_LOG_ERROR1("%s: wlan_setup() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info); result = -EIO; goto failed; } @@ -3851,7 +3851,7 @@ prism2sta_probe_plx( if (result != 0) { unregister_wlandev(wlandev); hfa384x_destroy(hw); - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "%s: hfa384x_corereset() failed.\n", dev_info); result = -EIO; @@ -3962,7 +3962,7 @@ static void *prism2sta_probe_usb( DBFENTER; if ((wlandev = create_wlan()) == NULL) { - WLAN_LOG_ERROR1("%s: Memory allocation failure.\n", dev_info); + WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info); result = -EIO; goto failed; } @@ -3970,7 +3970,7 @@ static void *prism2sta_probe_usb( hw = priv->hw; if ( wlan_setup(wlandev) != 0 ) { - WLAN_LOG_ERROR1("%s: wlan_setup() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info); result = -EIO; goto failed; } @@ -3979,7 +3979,7 @@ static void *prism2sta_probe_usb( * linux netdevice. */ if ( register_wlandev(wlandev) != 0 ) { - WLAN_LOG_ERROR1("%s: wlan_setup() failed.\n", dev_info); + WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info); result = -EIO; goto failed; } @@ -4014,7 +4014,7 @@ static void *prism2sta_probe_usb( } if ((hw->endp_in == -1) || (hw->endp_out == -1)) { - WLAN_LOG_ERROR3("%s: endpoints not found! (in:%d out:%d)\n", dev_info, hw->endp_in, hw->endp_out); + WLAN_LOG_ERROR("%s: endpoints not found! (in:%d out:%d)\n", dev_info, hw->endp_in, hw->endp_out); } } @@ -4027,7 +4027,7 @@ static void *prism2sta_probe_usb( unregister_wlandev(wlandev); hfa384x_destroy(hw); result = -EIO; - WLAN_LOG_ERROR1( + WLAN_LOG_ERROR( "%s: hfa384x_corereset() failed.\n", dev_info); goto failed; @@ -4135,8 +4135,8 @@ int init_module(void) DBFENTER; - WLAN_LOG_NOTICE1("%s Loaded\n", version); - WLAN_LOG_NOTICE1("dev_info is: %s\n", dev_info); + WLAN_LOG_NOTICE("%s Loaded\n", version); + WLAN_LOG_NOTICE("dev_info is: %s\n", dev_info); #if (WLAN_HOSTIF == WLAN_PCMCIA) CardServices(GetCardServicesInfo, &serv); @@ -4273,7 +4273,7 @@ static wlandevice_t *create_wlan(void) hw = kmalloc(sizeof(hfa384x_t), GFP_KERNEL); if (!wlandev || !priv || !hw) { - WLAN_LOG_ERROR1("%s: Memory allocation failure.\n", dev_info); + WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info); if (wlandev) kfree(wlandev); if (priv) kfree(priv); if (hw) kfree(hw);