Skip to contentSkip to conversation

mac80211: re-upload keys only after telling driver about association

PATCH In review Johannes Berg 2 participants 4 messages Apr 8, 2009 – Apr 10, 2009 mac80211

lore
Share & tools
lore

Johannes Berg

author maintainer
#0 lore raw

PATCH 1/1 mac80211: re-upload keys only after telling driver about association

In the normal WPA or RSN case keys are only configured after associating, so we should do that in that order when resuming as well. It shouldn't really matter since we do not send any data at either point, but iwlwifi prefers it this way and it does seem more natural.

---
 net/mac80211/pm.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
net/mac80211/pm.c +5 -5
@@ -127,11 +127,6 @@ int __ieee80211_resume(struct ieee80211_
 
 	rcu_read_unlock();
 
-	/* add back keys */
-	list_for_each_entry(sdata, &local->interfaces, list)
-		if (netif_running(sdata->dev))
-			ieee80211_enable_keys(sdata);
-
 	/* setup RTS threshold */
 	if (local->ops->set_rts_threshold)
 		local->ops->set_rts_threshold(hw, local->rts_threshold);
@@ -172,6 +167,11 @@ int __ieee80211_resume(struct ieee80211_
 		}
 	}
 
+	/* add back keys */
+	list_for_each_entry(sdata, &local->interfaces, list)
+		if (netif_running(sdata->dev))
+			ieee80211_enable_keys(sdata);
+
 	ieee80211_wake_queues_by_reason(hw,
 			IEEE80211_QUEUE_STOP_REASON_SUSPEND);
 
#1 lore raw

Hi Johannes,

Quoted 5 lines · Johannes Berg

In the normal WPA or RSN case keys are only configured after associating, so we should do that in that order when resuming as well. It shouldn't really matter since we do not send any data at either point, but iwlwifi prefers it this way and it does seem more natural.

Could you please share the symptom of the problem with iwlwifi without this patch?

Thank you

Reinette

author maintainer
#2 lore raw

Hi,

Quoted 9 lines · Johannes Berg
Quoted 5 lines

In the normal WPA or RSN case keys are only configured after associating, so we should do that in that order when resuming as well. It shouldn't really matter since we do not send any data at either point, but iwlwifi prefers it this way and it does seem more natural.

Could you please share the symptom of the problem with iwlwifi without this patch?

[this is just a snippet from my other mail -- for the wider audience]

When you have a microcode error, we pretty much take the driver completely down, and the firmware is of course completely re-initialised. Now, when mac80211 goes to reconfigure the hardware, it would, before this patch, do this [simplified, but you can look at the code]:
1) ->start()
2) ->add_interface()
3) ->sta_notify() [which iwlwifi doesn't use]
4) ->set_key()
5) ->bss_info_changed()

and some more. Now, because iwlwifi ignores step 3, in step 4 it will complain "station not found" when mac80211 wants to add the pairwise key for the AP. Reordering 4 and 5 fixes that because iwlwifi adds the station in bss_info_changed and then the key upload can be successful.

johannes

#3 lore raw

Hi Johannes,

Quoted 26 lines · Johannes Berg

Hi,

Quoted 9 lines · Johannes Berg
Quoted 5 lines

In the normal WPA or RSN case keys are only configured after associating, so we should do that in that order when resuming as well. It shouldn't really matter since we do not send any data at either point, but iwlwifi prefers it this way and it does seem more natural.

Could you please share the symptom of the problem with iwlwifi without this patch?

[this is just a snippet from my other mail -- for the wider audience]

When you have a microcode error, we pretty much take the driver completely down, and the firmware is of course completely re-initialised. Now, when mac80211 goes to reconfigure the hardware, it would, before this patch, do this [simplified, but you can look at the code]:
1) ->start()
2) ->add_interface()
3) ->sta_notify() [which iwlwifi doesn't use]
4) ->set_key()
5) ->bss_info_changed()

Quoted 4 lines

and some more. Now, because iwlwifi ignores step 3, in step 4 it will complain "station not found" when mac80211 wants to add the pairwise key for the AP. Reordering 4 and 5 fixes that because iwlwifi adds the station in bss_info_changed and then the key upload can be successful.

Thank you very much for these details. I was really hoping that this may have something to do with our latest kerneloops.org attention, but it does not from what I can tell.

Reinette