projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dbfedbb
b5b9d66
)
Merge branch 'upstream-fixes'
author
Jeff Garzik
<jeff@garzik.org>
Wed, 1 Mar 2006 06:58:38 +0000
(
01:58
-0500)
committer
Jeff Garzik
<jeff@garzik.org>
Wed, 1 Mar 2006 06:58:38 +0000
(
01:58
-0500)
1
2
net/ieee80211/ieee80211_rx.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
net/ieee80211/ieee80211_rx.c
index fcf4382ef7d716655a1fe3a4f58191b72217bfcd,b410ab8bcf7afaa3d06b72265eb90d8db75ba97c..6b8469da29b15513e15962faa0be62890924c241
---
1
/
net/ieee80211/ieee80211_rx.c
---
2
/
net/ieee80211/ieee80211_rx.c
+++ b/
net/ieee80211/ieee80211_rx.c
@@@
-1509,12
-1408,9
+1505,10
@@@
static void ieee80211_process_probe_res
escape_essid(target->ssid,
target->ssid_len),
MAC_ARG(target->bssid),
- is_beacon(le16_to_cpu
- (beacon->header.
- frame_ctl)) ?
+ is_beacon(beacon->header.frame_ctl) ?
"BEACON" : "PROBE RESPONSE");
update_network(target, &network);
+ network.ibss_dfs = NULL;
}
spin_unlock_irqrestore(&ieee->lock, flags);