---

yaml --- r: 141167 b: refs/heads/master c: 2acbf9d h: refs/heads/master i: 141165: 3c22377 141163: 415c00e 141159: 3569f7a 141151: bb802aa v: v3
git-mirror · Apr 3, 2009 · 7696395 · 7696395
1 parent 788efb0
commit 7696395
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 090504701605d627b4a8ddb0d584f00613ee41fe
+refs/heads/master: 2acbf9de068cae281f3bc30c6d7e41133fc7e8f3
diff --git a/trunk/drivers/staging/wlan-ng/p80211netdev.c b/trunk/drivers/staging/wlan-ng/p80211netdev.c
@@ -418,7 +418,7 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd
 		 */
 		if(skb->protocol != ETH_P_80211_RAW) {
 			netif_start_queue(wlandev->netdev);
-			WLAN_LOG_NOTICE(
+			printk(KERN_NOTICE
 				"Tx attempt prior to association, frame dropped.\n");
 			wlandev->linux_stats.tx_dropped++;
 			result = 0;

diff --git a/trunk/drivers/staging/wlan-ng/wlan_compat.h b/trunk/drivers/staging/wlan-ng/wlan_compat.h
@@ -62,8 +62,6 @@
 
 #define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __func__ , ##args);
 
-#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __func__ , ##args);
-
 #if defined(WLAN_INCLUDE_DEBUG)
 	#define WLAN_HEX_DUMP( l, x, p, n)	if( WLAN_DBVAR >= (l) ){ \
 		int __i__; \