mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 06:21:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

More changes merged over from madwifi-dfs that seem to have been missed

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3161 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mtaylor 2008-01-16 19:45:36 +00:00
parent d01fbe3c85
commit 909dc70af4
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net80211/ieee80211_debug.h
View File

@ -78,7 +78,7 @@ enum {
#ifdef IEEE80211_DEBUG
#define ieee80211_msg_is_reported(_vap, m) \
(!!(((_vap)->iv_debug) & (m)))
(!!(((_vap)->iv_debug | (_vap)->iv_ic->ic_debug) & (m)))
#define IEEE80211_DPRINTF(_vap, _m, _fmt, ...) do { \
if (ieee80211_msg_is_reported(_vap, _m)) \
ieee80211_note(_vap, _fmt, __VA_ARGS__); \

4
net80211/ieee80211_monitor.c
View File

@ -303,7 +303,9 @@ ieee80211_input_monitor(struct ieee80211com *ic, struct sk_buff *skb,
{
struct ieee80211vap *vap, *next;
struct ath_desc *ds = bf->bf_desc;
int noise = 0, antenna = 0, ieeerate = 0;
int noise = 0;
int antenna = 0;
int ieeerate = 0;
u_int32_t rssi = 0;
u_int8_t pkttype = 0;
unsigned int mon_hdrspace = A_MAX(sizeof(struct ath_tx_radiotap_header),

7
net80211/ieee80211_output.c
View File

@ -608,6 +608,13 @@ ieee80211_skbhdr_adjust(struct ieee80211vap *vap, int hdrsize,
need_tailroom += cip->ic_miclen;
}
if (skb_shared(skb)) {
/* Take our own reference to the node in the clone */
ieee80211_ref_node(SKB_CB(skb)->ni);
/* Unshare the node, decrementing users in the old skb */
skb = skb_unshare(skb, GFP_ATOMIC);
}
#ifdef ATH_SUPERG_FF
if (isff) {
if (skb == NULL) {

4
net80211/ieee80211_power.c
View File

@ -231,7 +231,9 @@ ieee80211_pwrsave(struct sk_buff *skb)
if (ieee80211_msg_dumppkts(vap))
ieee80211_dump_pkt(ni->ni_ic, skb->data, skb->len, -1, -1);
#endif
ieee80211_unref_node(&SKB_CB(skb)->ni);
if (SKB_CB(skb)->ni != NULL)
ieee80211_unref_node(&SKB_CB(skb)->ni);
ieee80211_dev_kfree_skb(&skb);
return NETDEV_TX_BUSY;
}