3 @@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *ade
5 int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
7 - hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
8 + __clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, hw->flags);
10 hw->wiphy->max_scan_ssids = 1;
12 @@ -525,14 +525,14 @@ int acx_init_ieee80211(acx_device_t *ade
13 /* We base signal quality on winlevel approach of previous driver
14 * TODO OW 20100615 This should into a common init code
16 - hw->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
17 + __set_bit(IEEE80211_HW_SIGNAL_UNSPEC, hw->flags);
20 if (IS_ACX100(adev)) {
21 - adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
22 + adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
24 } else if (IS_ACX111(adev))
25 - adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
26 + adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
29 log(L_ANY, "Error: Unknown device");
30 @@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee
31 changed_flags, *total_flags);
33 /* OWI TODO: Set also FIF_PROBE_REQ ? */
34 - *total_flags &= (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL
35 - | FIF_CONTROL | FIF_OTHER_BSS);
36 + *total_flags &= (FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL
39 logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
41 @@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw,
44 int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
45 - struct cfg80211_scan_request *req)
46 + struct ieee80211_scan_request *hw_req)
48 acx_device_t *adev = hw2adev(hw);
49 + struct cfg80211_scan_request *req = &hw_req->req;
53 @@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *
57 - skb = ieee80211_probereq_get(adev->hw, adev->vif, ssid, ssid_len,
58 + skb = ieee80211_probereq_get(adev->hw, vif->addr, ssid, ssid_len,
64 @@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw,
67 int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
68 - struct cfg80211_scan_request *req);
69 + struct ieee80211_scan_request *req);
71 int acx_recover_hw(acx_device_t *adev);
75 @@ -159,7 +159,7 @@ int acx_set_channel(acx_device_t *adev,
78 adev->rx_status.freq = freq;
79 - adev->rx_status.band = IEEE80211_BAND_2GHZ;
80 + adev->rx_status.band = NL80211_BAND_2GHZ;
82 adev->channel = channel;