1 diff --git a/main.c b/main.c
2 index bfec856..3c482d9 100644
5 @@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *adev)
7 int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
9 - hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
10 + __clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, hw->flags);
12 hw->wiphy->max_scan_ssids = 1;
14 @@ -525,7 +525,7 @@ int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
15 /* We base signal quality on winlevel approach of previous driver
16 * TODO OW 20100615 This should into a common init code
18 - hw->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
19 + __set_bit(IEEE80211_HW_SIGNAL_UNSPEC, hw->flags);
22 if (IS_ACX100(adev)) {
23 @@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee80211_hw *hw,
24 changed_flags, *total_flags);
26 /* OWI TODO: Set also FIF_PROBE_REQ ? */
27 - *total_flags &= (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL
28 - | FIF_CONTROL | FIF_OTHER_BSS);
29 + *total_flags &= (FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL
32 logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
34 @@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
37 int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
38 - struct cfg80211_scan_request *req)
39 + struct ieee80211_scan_request *hw_req)
41 acx_device_t *adev = hw2adev(hw);
42 + struct cfg80211_scan_request *req = &hw_req->req;
46 @@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
50 - skb = ieee80211_probereq_get(adev->hw, adev->vif, ssid, ssid_len,
51 + skb = ieee80211_probereq_get(adev->hw, vif->addr, ssid, ssid_len,
55 diff --git a/main.h b/main.h
56 index 293f5c8..84ecb9a 100644
59 @@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
62 int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
63 - struct cfg80211_scan_request *req);
64 + struct ieee80211_scan_request *req);
66 int acx_recover_hw(acx_device_t *adev);