Patchwork Build fix in drivers/net/wireless/ath/ath9k/main.c

login
register
mail settings
Submitter Arvydas Sidorenko
Date June 27, 2012, 7:19 p.m.
Message ID <1340824779-5157-1-git-send-email-asido4@gmail.com>
Download mbox | patch
Permalink /patch/167720/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

John W. Linville - June 27, 2012, 6:27 p.m.
Thanks, but Sujith beat you to the same fix.

John

On Wed, Jun 27, 2012 at 09:19:39PM +0200, Arvydas Sidorenko wrote:
> Commit fad29cd2f59949581050a937786c2c9bc78b2f04 broke the build if
> no CONFIG_ATH9K_BTCOEX_SUPPORT is enabled.
> 
> Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
> ---
>  drivers/net/wireless/ath/ath9k/main.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
> index c14cf5a..e4e73f0 100644
> --- a/drivers/net/wireless/ath/ath9k/main.c
> +++ b/drivers/net/wireless/ath/ath9k/main.c
> @@ -151,8 +151,10 @@ static void __ath_cancel_work(struct ath_softc *sc)
>  	cancel_delayed_work_sync(&sc->tx_complete_work);
>  	cancel_delayed_work_sync(&sc->hw_pll_work);
>  
> +#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
>  	if (ath9k_hw_mci_is_enabled(sc->sc_ah))
>  		cancel_work_sync(&sc->mci_work);
> +#endif
>  }
>  
>  static void ath_cancel_work(struct ath_softc *sc)
> -- 
> 1.7.8.6
> 
>
Arvydas Sidorenko - June 27, 2012, 7:19 p.m.
Commit fad29cd2f59949581050a937786c2c9bc78b2f04 broke the build if
no CONFIG_ATH9K_BTCOEX_SUPPORT is enabled.

Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
---
 drivers/net/wireless/ath/ath9k/main.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Mohammed Shafi - June 28, 2012, 5:09 a.m.
Hi,

On Thu, Jun 28, 2012 at 12:49 AM, Arvydas Sidorenko <asido4@gmail.com> wrote:
> Commit fad29cd2f59949581050a937786c2c9bc78b2f04 broke the build if
> no CONFIG_ATH9K_BTCOEX_SUPPORT is enabled.
>
> Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
> ---
>  drivers/net/wireless/ath/ath9k/main.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
> index c14cf5a..e4e73f0 100644
> --- a/drivers/net/wireless/ath/ath9k/main.c
> +++ b/drivers/net/wireless/ath/ath9k/main.c
> @@ -151,8 +151,10 @@ static void __ath_cancel_work(struct ath_softc *sc)
>        cancel_delayed_work_sync(&sc->tx_complete_work);
>        cancel_delayed_work_sync(&sc->hw_pll_work);
>
> +#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
>        if (ath9k_hw_mci_is_enabled(sc->sc_ah))
>                cancel_work_sync(&sc->mci_work);
> +#endif
>  }
>
>  static void ath_cancel_work(struct ath_softc *sc)
> --
> 1.7.8.6

thanks for the patch, but it was just sent some time back
http://www.spinics.net/lists/linux-wireless/msg93078.html


>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index c14cf5a..e4e73f0 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -151,8 +151,10 @@  static void __ath_cancel_work(struct ath_softc *sc)
 	cancel_delayed_work_sync(&sc->tx_complete_work);
 	cancel_delayed_work_sync(&sc->hw_pll_work);
 
+#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
 	if (ath9k_hw_mci_is_enabled(sc->sc_ah))
 		cancel_work_sync(&sc->mci_work);
+#endif
 }
 
 static void ath_cancel_work(struct ath_softc *sc)