package/kernel/acx-mac80211/patches/300-kernel_4_2.patch

   1 diff --git a/main.c b/main.c
   2 index bfec856..3c482d9 100644
   3 --- a/main.c
   4 +++ b/main.c
   5 @@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *adev)
   6
   7  int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
   8  {
   9 -       hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
  10 +       __clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, hw->flags);
  11         hw->queues = 1;
  12         hw->wiphy->max_scan_ssids = 1;
  13
  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
  17          */
  18 -       hw->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
  19 +       __set_bit(IEEE80211_HW_SIGNAL_UNSPEC, hw->flags);
  20         hw->max_signal = 100;
  21
  22         if (IS_ACX100(adev)) {
  23 @@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee80211_hw *hw,
  24                 changed_flags, *total_flags);
  25
  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
  30 +                       | FIF_OTHER_BSS);
  31
  32         logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
  33
  34 @@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
  35  }
  36
  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)
  40  {
  41         acx_device_t *adev = hw2adev(hw);
  42 +       struct cfg80211_scan_request *req = &hw_req->req;
  43         struct sk_buff *skb;
  44         size_t ssid_len = 0;
  45         u8 *ssid = NULL;
  46 @@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
  47                 goto out;
  48         }
  49  #else
  50 -       skb = ieee80211_probereq_get(adev->hw, adev->vif, ssid, ssid_len,
  51 +       skb = ieee80211_probereq_get(adev->hw, vif->addr, ssid, ssid_len,
  52                 req->ie_len);
  53         if (!skb) {
  54                 ret = -ENOMEM;
  55 diff --git a/main.h b/main.h
  56 index 293f5c8..84ecb9a 100644
  57 --- a/main.h
  58 +++ b/main.h
  59 @@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
  60  #endif
  61
  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);
  65
  66  int acx_recover_hw(acx_device_t *adev);
  67