diff for duplicates of <20140513104141.GA14670@qca.qualcomm.com> diff --git a/a/1.txt b/N1/1.txt index 3d35130..844a5ff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,10 +60,3 @@ called by sw_roc without stopping ani. Can you please test with attached change? -Rajkumar --------------- next part -------------- -A non-text attachment was scrubbed... -Name: ani.patch -Type: text/x-diff -Size: 830 bytes -Desc: not available -Url : http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20140513/c61b1703/attachment.patch diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..95b1582 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,2 @@ +Content-Type: text/x-diff; charset="us-ascii" +Content-Disposition: attachment; filename="ani.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..8519cd1 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,23 @@ +diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c +index f46cd02..5627917 100644 +--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c +@@ -95,8 +95,10 @@ static void ath9k_htc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) + + if ((vif->type == NL80211_IFTYPE_AP || + vif->type == NL80211_IFTYPE_MESH_POINT) && +- bss_conf->enable_beacon) ++ bss_conf->enable_beacon) { + priv->reconfig_beacon = true; ++ priv->rearm_ani = true; ++ } + + if (bss_conf->assoc) { + priv->rearm_ani = true; +@@ -257,6 +259,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv, + + ath9k_htc_ps_wakeup(priv); + ++ ath9k_htc_stop_ani(priv); + del_timer_sync(&priv->tx.cleanup_timer); + ath9k_htc_tx_drain(priv); diff --git a/a/content_digest b/N1/content_digest index 5d95467..ea17dd0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,10 +7,14 @@ "ref\020140513090056.GA31546@qca.qualcomm.com\0" "ref\0CANq1E4QY+mSeMJx0ctWvAdmrsONCFaD+6268HnuowMKOM2FdFQ@mail.gmail.com\0" "From\0Rajkumar Manoharan <rmanohar@qti.qualcomm.com>\0" - "Subject\0[ath9k-devel] [PATCH] ath9k: fix NULL-deref in hw_per_calibration() for ar9002\0" + "Subject\0Re: [ath9k-devel] [PATCH] ath9k: fix NULL-deref in hw_per_calibration() for ar9002\0" "Date\0Tue, 13 May 2014 16:11:43 +0530\0" - "To\0ath9k-devel@lists.ath9k.org\0" - "\00:1\0" + "To\0David Herrmann <dh.herrmann@gmail.com>\0" + "Cc\0Felix Fietkau <nbd@openwrt.org>" + John W. Linville <linville@tuxdriver.com> + <ath9k-devel@venema.h4ckr.net> + " linux-wireless <linux-wireless@vger.kernel.org>\0" + "\01:1\0" "b\0" "On Tue, May 13, 2014 at 11:09:48AM +0200, David Herrmann wrote:\n" "> Hi\n" @@ -73,13 +77,32 @@ "\n" "Can you please test with attached change?\n" "\n" - "-Rajkumar\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: ani.patch\n" - "Type: text/x-diff\n" - "Size: 830 bytes\n" - "Desc: not available\n" - Url : http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20140513/c61b1703/attachment.patch + -Rajkumar + "\01:2\0" + "fn\0ani.patch\0" + "b\0" + "diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c\n" + "index f46cd02..5627917 100644\n" + "--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c\n" + "+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c\n" + "@@ -95,8 +95,10 @@ static void ath9k_htc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)\n" + " \n" + " \tif ((vif->type == NL80211_IFTYPE_AP ||\n" + " \t vif->type == NL80211_IFTYPE_MESH_POINT) &&\n" + "-\t bss_conf->enable_beacon)\n" + "+\t bss_conf->enable_beacon) {\n" + " \t\tpriv->reconfig_beacon = true;\n" + "+\t\tpriv->rearm_ani = true;\n" + "+\t}\n" + " \n" + " \tif (bss_conf->assoc) {\n" + " \t\tpriv->rearm_ani = true;\n" + "@@ -257,6 +259,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,\n" + " \n" + " \tath9k_htc_ps_wakeup(priv);\n" + " \n" + "+\tath9k_htc_stop_ani(priv);\n" + " \tdel_timer_sync(&priv->tx.cleanup_timer);\n" + " \tath9k_htc_tx_drain(priv);" -83c8634f2b662af548ecef4fa7f3844186aa3dcde08b2863d6bf37ad8e1bb114 +39c081ff278e98ae2b694f400ed9bf0575a32dac85d21e04434b252d0a27cb34
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.