diff --git a/iwlwifi-dvm-clear-IWL_STA_UCODE_INPROGRESS-when-asso.patch b/iwlwifi-dvm-clear-IWL_STA_UCODE_INPROGRESS-when-asso.patch new file mode 100644 index 0000000..6db25b3 --- /dev/null +++ b/iwlwifi-dvm-clear-IWL_STA_UCODE_INPROGRESS-when-asso.patch @@ -0,0 +1,39 @@ +Bugzilla: 1065663 +Upstream-status: 3.14 + +From ec6f678c74dbdb06a6a775bbb00f1d26c17c404b Mon Sep 17 00:00:00 2001 +From: Emmanuel Grumbach +Date: Tue, 18 Feb 2014 10:30:18 +0200 +Subject: [PATCH] iwlwifi: dvm: clear IWL_STA_UCODE_INPROGRESS when assoc fails + +We set IWL_STA_UCODE_INPROGRESS flag when we add a station +and clear it when we send the LQ command for it. But the LQ +command is sent only when the association succeeds. +If the association doesn't succeed, we would leave this flag +set and that wouldn't indicate the station entry as vacant. + +This probably fixes: +https://bugzilla.redhat.com/show_bug.cgi?id=1065663 + +Cc: +Reviewed-by: Johannes Berg +Signed-off-by: Emmanuel Grumbach +--- + drivers/net/wireless/iwlwifi/dvm/sta.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c +index c0d070c..9cdd91c 100644 +--- a/drivers/net/wireless/iwlwifi/dvm/sta.c ++++ b/drivers/net/wireless/iwlwifi/dvm/sta.c +@@ -590,6 +590,7 @@ void iwl_deactivate_station(struct iwl_priv *priv, const u8 sta_id, + sizeof(priv->tid_data[sta_id][tid])); + + priv->stations[sta_id].used &= ~IWL_STA_DRIVER_ACTIVE; ++ priv->stations[sta_id].used &= ~IWL_STA_UCODE_INPROGRESS; + + priv->num_stations--; + +-- +1.8.5.3 + diff --git a/kernel.spec b/kernel.spec index 399d504..111230f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -801,6 +801,9 @@ Patch25037: ACPI-EC-Clear-stale-EC-events-on-Samsung-systems.patch Patch25038: Revert-USBNET-ax88179_178a-enable-tso-if-usb-host-supports-sg-dma.patch Patch25039: Revert-xhci-1.0-Limit-arbitrarily-aligned-scatter-gather.patch +#rhbz 1065663 +Patch25040: iwlwifi-dvm-clear-IWL_STA_UCODE_INPROGRESS-when-asso.patch + # END OF PATCH DEFINITIONS %endif @@ -1558,6 +1561,9 @@ ApplyPatch ACPI-EC-Clear-stale-EC-events-on-Samsung-systems.patch ApplyPatch Revert-USBNET-ax88179_178a-enable-tso-if-usb-host-supports-sg-dma.patch ApplyPatch Revert-xhci-1.0-Limit-arbitrarily-aligned-scatter-gather.patch +#rhbz 1065663 +ApplyPatch iwlwifi-dvm-clear-IWL_STA_UCODE_INPROGRESS-when-asso.patch + # END OF PATCH APPLICATIONS %endif @@ -2370,6 +2376,7 @@ fi # || || %changelog * Fri Mar 07 2014 Josh Boyer +- Add patch to fix iwldvm WARN (rhbz 1065663) - Revert two xhci fixes that break USB mass storage (rhbz 1073180) * Thu Mar 06 2014 Josh Boyer