package/mac80211/patches/110-ath5k_stat.patch

   1 This patch removes the unnecessary ATH_STAT_MRRETRY flag and turns
   2 other ATH_STAT_* defines into an enum
   3
   4 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
   5
   6 --- a/drivers/net/wireless/ath5k/base.c
   7 +++ b/drivers/net/wireless/ath5k/base.c
   8 @@ -724,19 +724,6 @@ ath5k_attach(struct pci_dev *pdev, struc
   9         ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "devid 0x%x\n", pdev->device);
  10
  11         /*
  12 -        * Check if the MAC has multi-rate retry support.
  13 -        * We do this by trying to setup a fake extended
  14 -        * descriptor.  MAC's that don't have support will
  15 -        * return false w/o doing anything.  MAC's that do
  16 -        * support it will return true w/o doing anything.
  17 -        */
  18 -       ret = ah->ah_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);
  19 -       if (ret < 0)
  20 -               goto err;
  21 -       if (ret > 0)
  22 -               __set_bit(ATH_STAT_MRRETRY, sc->status);
  23 -
  24 -       /*
  25          * Reset the key cache since some parts do not
  26          * reset the contents on initial power up.
  27          */
  28 --- a/drivers/net/wireless/ath5k/base.h
  29 +++ b/drivers/net/wireless/ath5k/base.h
  30 @@ -99,6 +99,12 @@ struct ath5k_led
  31  #define ATH_CHAN_MAX   (14+14+14+252+20)
  32  #endif
  33
  34 +enum {
  35 +       ATH_STAT_INVALID,               /* disable hardware accesses */
  36 +       ATH_STAT_PROMISC,
  37 +       ATH_STAT_LEDSOFT                /* enable LED gpio status */
  38 +};
  39 +
  40  /* Software Carrier, keeps track of the driver state
  41   * associated with an instance of a device */
  42  struct ath5k_softc {
  43 @@ -129,10 +135,6 @@ struct ath5k_softc {
  44         u16                     cachelsz;       /* cache line size */
  45
  46         DECLARE_BITMAP(status, 4);
  47 -#define ATH_STAT_INVALID       0               /* disable hardware accesses */
  48 -#define ATH_STAT_MRRETRY       1               /* multi-rate retry support */
  49 -#define ATH_STAT_PROMISC       2
  50 -#define ATH_STAT_LEDSOFT       3               /* enable LED gpio status */
  51
  52         unsigned int            filter_flags;   /* HW flags, AR5K_RX_FILTER_* */
  53         unsigned int            curmode;        /* current phy mode */