From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 1 Mar 2006 06:58:38 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~52
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68727fed5469100bec0764207d7efb7a9ecdee29;p=linux-2.6

Merge branch 'upstream-fixes'
---

68727fed5469100bec0764207d7efb7a9ecdee29
diff --cc net/ieee80211/ieee80211_rx.c
index fcf4382ef7,b410ab8bcf..6b8469da29
--- a/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);