package/acx-mac80211/patches/005-pci_fixes.patch

   1 --- a/acx_func.h
   2 +++ b/acx_func.h
   3 @@ -623,7 +623,7 @@ void acx_config_interface(struct ieee802
   4                                 struct ieee80211_vif *vif,
   5                                 struct ieee80211_bss_conf *info,
   6                                 u32 changes);
   7 -int acx_net_config(struct ieee80211_hw* ieee, struct ieee80211_conf *conf);
   8 +int acx_net_config(struct ieee80211_hw* ieee, u32 changed);
   9  int acx_net_get_tx_stats(struct ieee80211_hw* ieee, struct ieee80211_tx_queue_stats *stats);
  10  int acx_net_conf_tx(struct ieee80211_hw* ieee, u16 queue,
  11                 const struct ieee80211_tx_queue_params *params);
  12 --- a/common.c
  13 +++ b/common.c
  14 @@ -4300,9 +4300,10 @@ int acx_selectchannel(acx_device_t * ade
  15  ** Derived from mac80211 code, p54, bcm43xx_mac80211
  16  **
  17  */
  18 -int acx_net_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
  19 +int acx_net_config(struct ieee80211_hw *hw, u32 changed)
  20  {
  21         acx_device_t *adev = ieee2adev(hw);
  22 +       struct ieee80211_conf *conf = &hw->conf;
  23         unsigned long flags;
  24
  25         FN_ENTER;
  26 --- a/pci.c
  27 +++ b/pci.c
  28 @@ -3105,7 +3105,7 @@ acxpci_l_tx_data(acx_device_t *adev, tx_
  29
  30         /* let chip do RTS/CTS handshaking before sending
  31          * in case packet size exceeds threshold */
  32 -       if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)
  33 +       if (info->flags & IEEE80211_TX_RC_USE_RTS_CTS)
  34                 SET_BIT(Ctl2_8, DESC_CTL2_RTS);
  35         else
  36                 CLEAR_BIT(Ctl2_8, DESC_CTL2_RTS);
  37 @@ -3120,7 +3120,7 @@ acxpci_l_tx_data(acx_device_t *adev, tx_
  38  /*     put_txcr(adev, txdesc, clt, rate_cur);  deprecated by mac80211 */
  39
  40         txdesc->total_length = cpu_to_le16(len);
  41 -       wlhdr_len = ieee80211_get_hdrlen(le16_to_cpu(wireless_header->frame_control));
  42 +       wlhdr_len = ieee80211_hdrlen(le16_to_cpu(wireless_header->frame_control));
  43         hostdesc2->length = cpu_to_le16(len - wlhdr_len);
  44  /*
  45         if (!ieeectl->do_not_encrypt && ieeectl->key_idx>= 0)
  46 @@ -3444,8 +3444,8 @@ unsigned int acxpci_l_clean_txdesc(acx_d
  47                 /* And finally report upstream */
  48                 if (hostdesc)
  49                 {
  50 -                       info->status.excessive_retries = rts_failures;
  51 -                       info->status.retry_count = ack_failures;
  52 +                       //info->status.excessive_retries = rts_failures;
  53 +                       //info->status.retry_count = ack_failures;
  54                         ieee80211_tx_status(adev->ieee, hostdesc->skb);
  55                 }
  56                 /* update pointer for descr to be cleaned next */