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

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