From 7696395ec5a14d83ea8ce4e87cb36920314162f7 Mon Sep 17 00:00:00 2001 From: Moritz Muehlenhoff Date: Sun, 25 Jan 2009 21:54:59 +0100 Subject: [PATCH] --- yaml --- r: 141167 b: refs/heads/master c: 2acbf9de068cae281f3bc30c6d7e41133fc7e8f3 h: refs/heads/master i: 141165: 3c22377075304e911c8adf5963fb500fc794e6a2 141163: 415c00e261c26206e37f7685e48b84cfca4102ba 141159: 3569f7ad9873ff6ad36097a9b84131da689ac179 141151: bb802aa15ba0b921d7094f596921987dceccd2a1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/p80211netdev.c | 2 +- trunk/drivers/staging/wlan-ng/wlan_compat.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0c402dba51a7..0942e9310824 100644 --- 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 index 7be8efaf7c6f..85a686b2ecea 100644 --- 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 index 42d8d0c95b60..fd4728b35f9b 100644 --- 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__; \