Merge branch 'upstream-fixes'

diff --cc net/ieee80211/ieee80211_rx.c
index fcf4382,b410ab8..6b8469d
--- 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);