> +#ifdef CONFIG_RFKILL > + u16 ah_rfsilent; > + u32 ah_rfkill_gpio ; small typo, space too much. > --- a/drivers/net/wireless/ath9k/core.h > +++ b/drivers/net/wireless/ath9k/core.h > @@ -40,6 +40,9 @@ > #include <asm/page.h> > #include <net/mac80211.h> > #include <linux/leds.h> > +#ifdef CONFIG_RFKILL > +#include <linux/rfkill.h> > +#endif > > #include "ath9k.h" > #include "rc.h" > @@ -823,6 +826,17 @@ struct ath_led { > bool registered; > }; > > +#ifdef CONFIG_RFKILL > +/* Rfkill */ > +#define ATH_RFKILL_POLL_INTERVAL 2000 /* msecs */ > + > +struct ath_rfkill { > + struct rfkill *rfkill; > + struct delayed_work rfkill_poll; > + char rfkill_name[32]; > +}; > +#endif > + No need to protect any of this with an #ifdef. > +#ifdef CONFIG_RFKILL > +#define SC_OP_RFKILL_REGISTERED BIT(11) > +#define SC_OP_RFKILL_SW_BLOCKED BIT(12) > +#define SC_OP_RFKILL_HW_BLOCKED BIT(13) > +#endif Nor that. > +static void ath9k_ht_conf(struct ath_softc *sc, > + struct ieee80211_bss_conf *bss_conf) > +{ > +#define IEEE80211_HT_CAP_40MHZ_INTOLERANT BIT(14) > + struct ath_ht_info *ht_info = &sc->sc_ht_info; All that doesn't seem to belong into this patch? johannes
Attachment:
signature.asc
Description: This is a digitally signed message part