Print this page
5255 uts shouldn't open-code ISP2

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/arn/arn_main.c
          +++ new/usr/src/uts/common/io/arn/arn_main.c
↓ open down ↓ 11 lines elided ↑ open up ↑
  12   12   *
  13   13   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  14   14   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  15   15   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  16   16   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  17   17   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  18   18   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  19   19   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  20   20   */
  21   21  
       22 +#include <sys/sysmacros.h>
  22   23  #include <sys/param.h>
  23   24  #include <sys/types.h>
  24   25  #include <sys/signal.h>
  25   26  #include <sys/stream.h>
  26   27  #include <sys/termio.h>
  27   28  #include <sys/errno.h>
  28   29  #include <sys/file.h>
  29   30  #include <sys/cmn_err.h>
  30   31  #include <sys/stropts.h>
  31   32  #include <sys/strsubr.h>
↓ open down ↓ 2606 lines elided ↑ open up ↑
2638 2639          /* Todo: IEEE80211_HTCAP_SMPS */
2639 2640          ht_info->cap = IEEE80211_HTCAP_CHWIDTH40|
2640 2641              IEEE80211_HTCAP_SHORTGI40 |
2641 2642              IEEE80211_HTCAP_DSSSCCK40;
2642 2643  
2643 2644          ht_info->ampdu_factor = ATH9K_HT_CAP_MAXRXAMPDU_65536;
2644 2645          ht_info->ampdu_density = ATH9K_HT_CAP_MPDUDENSITY_8;
2645 2646  
2646 2647          /* set up supported mcs set */
2647 2648          (void) memset(&ht_info->rx_mcs_mask, 0, sizeof (ht_info->rx_mcs_mask));
2648      -        tx_streams =
2649      -            !(sc->sc_ah->ah_caps.tx_chainmask &
2650      -            (sc->sc_ah->ah_caps.tx_chainmask - 1)) ? 1 : 2;
2651      -        rx_streams =
2652      -            !(sc->sc_ah->ah_caps.rx_chainmask &
2653      -            (sc->sc_ah->ah_caps.rx_chainmask - 1)) ? 1 : 2;
     2649 +        tx_streams = ISP2(sc->sc_ah->ah_caps.tx_chainmask) ? 1 : 2;
     2650 +        rx_streams = ISP2(sc->sc_ah->ah_caps.rx_chainmask) ? 1 : 2;
2654 2651  
2655 2652          ht_info->rx_mcs_mask[0] = 0xff;
2656 2653          if (rx_streams >= 2)
2657 2654                  ht_info->rx_mcs_mask[1] = 0xff;
2658 2655  }
2659 2656  
2660 2657  /* xxx should be used for ht rate set negotiating ? */
2661 2658  static void
2662 2659  arn_overwrite_11n_rateset(struct arn_softc *sc)
2663 2660  {
↓ open down ↓ 892 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX