ipw2x00: age scan results on resume

PATCH Superseded Dan Williams 2 participants 3 messages Feb 10, 2009 – Feb 11, 2009

Subsystems (2)

Networking Networking drivers (wireless)

lore

Share & tools

lore

Dan Williams

author

2009-02-10 22:12 UTC #0 lore raw

PATCH v2 1/1 ipw2x00: age scan results on resume

Scanned BSS entries are timestamped with jiffies, which doesn't increment across suspend and hibernate. On resume, every BSS in the scan list looks like it was scanned within the last 10 seconds, irregardless of how long the machine was actually asleep. Age scan results on resume with the time spent during sleep so userspace has a clue how old they really are.

Signed-off-by Dan Williams <[email protected]>

---
This fixes NetworkManager and wpa_supplicant trying to connect to the AP associated with at suspend/hibernate time, which clearly may not exist at the location where the machine is waking up.

v2: always set suspend_at

drivers/net/wireless/ipw2x00/ipw2100.c +11 -1

index 823c2bf..abf897d 100644
@@ -1692,7 +1692,13 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
 	u32 lock;
 	u32 ord_len = sizeof(lock);
 
-	/* Quite if manually disabled. */
+	/* Age scan list entries found before suspend */
+	if (priv->suspend_time) {
+		ieee80211_networks_age(priv->ieee, priv->suspend_time);
+		priv->suspend_time = 0;
+	}
+
+	/* Quiet if manually disabled. */
 	if (priv->status & STATUS_RF_KILL_SW) {
 		IPW_DEBUG_INFO("%s: Radio is disabled by Manual Disable "
 			       "switch\n", priv->net_dev->name);

@@ -6414,6 +6420,8 @@ static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state)
 	pci_disable_device(pci_dev);
 	pci_set_power_state(pci_dev, PCI_D3hot);
 
+	priv->suspend_at = get_seconds();
+
 	mutex_unlock(&priv->action_mutex);
 
 	return 0;

@@ -6457,6 +6465,8 @@ static int ipw2100_resume(struct pci_dev *pci_dev)
 	 * the queue of needed */
 	netif_device_attach(dev);
 
+	priv->suspend_time = get_seconds() - priv->suspend_at;
+
 	/* Bring the device back up */
 	if (!(priv->status & STATUS_RF_KILL_SW))
 		ipw2100_up(priv, 0);

drivers/net/wireless/ipw2x00/ipw2100.h +4 -0

index bbf1ddc..430534b 100644
@@ -591,6 +591,10 @@ struct ipw2100_priv {
 
 	int user_requested_scan;
 
+	/* Track time in suspend */
+	unsigned long suspend_at;
+	unsigned long suspend_time;
+
 	u32 interrupts;
 	int tx_interrupts;
 	int rx_interrupts;

drivers/net/wireless/ipw2x00/ipw2200.c +10 -0

index 0420d3d..74e2ea3 100644
@@ -11224,6 +11224,12 @@ static int ipw_up(struct ipw_priv *priv)
 {
 	int rc, i, j;
 
+	/* Age scan list entries found before suspend */
+	if (priv->suspend_time) {
+		ieee80211_networks_age(priv->ieee, priv->suspend_time);
+		priv->suspend_time = 0;
+	}
+
 	if (priv->status & STATUS_EXIT_PENDING)
 		return -EIO;

@@ -11824,6 +11830,8 @@ static int ipw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 	pci_disable_device(pdev);
 	pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
+	priv->suspend_at = get_seconds();
+
 	return 0;
 }

@@ -11859,6 +11867,8 @@ static int ipw_pci_resume(struct pci_dev *pdev)
 	 * the queue of needed */
 	netif_device_attach(dev);
 
+	priv->suspend_time = get_seconds() - priv->suspend_at;
+
 	/* Bring the device back up */
 	queue_work(priv->workqueue, &priv->up);

drivers/net/wireless/ipw2x00/ipw2200.h +4 -0

index 277b274..7d88c75 100644
@@ -1346,6 +1346,10 @@ struct ipw_priv {
 
 	s8 tx_power;
 
+	/* Track time in suspend */
+	unsigned long suspend_at;
+	unsigned long suspend_time;
+
 #ifdef CONFIG_PM
 	u32 pm_state[16];
 #endif

drivers/net/wireless/ipw2x00/libipw_module.c +17 -0

index a2f5616..da27d40 100644
@@ -105,6 +105,23 @@ static inline void ieee80211_networks_free(struct ieee80211_device *ieee)
 	ieee->networks = NULL;
 }
 
+void ieee80211_networks_age(struct ieee80211_device *ieee,
+                            unsigned long age_secs)
+{
+	struct list_head *element, *safe;
+	struct ieee80211_network *network = NULL;
+	unsigned long flags;
+	unsigned long age_jiffies = msecs_to_jiffies(age_secs * MSEC_PER_SEC);
+
+	spin_lock_irqsave(&ieee->lock, flags);
+	list_for_each_safe(element, safe, &ieee->network_list) {
+		network = list_entry(element, struct ieee80211_network, list);
+		network->last_scanned += age_jiffies;
+	}
+	spin_unlock_irqrestore(&ieee->lock, flags);
+}
+EXPORT_SYMBOL(ieee80211_networks_age);
+
 static void ieee80211_networks_initialize(struct ieee80211_device *ieee)
 {
 	int i;

include/net/ieee80211.h +3 -0

index adb7cf3..7515fad 100644
@@ -1119,6 +1119,9 @@ static inline int ieee80211_is_cck_rate(u8 rate)
 extern void free_ieee80211(struct net_device *dev);
 extern struct net_device *alloc_ieee80211(int sizeof_priv);
 
+extern void ieee80211_networks_age(struct ieee80211_device *ieee,
+				   unsigned long age_secs);
+
 extern int ieee80211_set_encryption(struct ieee80211_device *ieee);
 
 /* ieee80211_tx.c */

reinette chatre

Acked-by on v2 1/1

2009-02-10 22:54 UTC #1 lore raw

Quoted 7 lines · Dan Williams

Scanned BSS entries are timestamped with jiffies, which doesn't increment across suspend and hibernate. On resume, every BSS in the scan list looks like it was scanned within the last 10 seconds, irregardless of how long the machine was actually asleep. Age scan results on resume with the time spent during sleep so userspace has a clue how old they really are.

Quoted 7 lines

Signed-off-by Dan Williams <[email protected]>
---
This fixes NetworkManager and wpa_supplicant trying to connect to the AP associated with at suspend/hibernate time, which clearly may not exist at the location where the machine is waking up.
v2: always set suspend_at

Thank you.

Acked-by Reinette Chatre <[email protected]>

Reinette

Dan Williams

author

2009-02-11 17:16 UTC #2 lore raw

Quoted 14 lines · reinette chatre

Quoted 13 lines · Dan Williams
Scanned BSS entries are timestamped with jiffies, which doesn't increment across suspend and hibernate. On resume, every BSS in the scan list looks like it was scanned within the last 10 seconds, irregardless of how long the machine was actually asleep. Age scan results on resume with the time spent during sleep so userspace has a clue how old they really are.
Signed-off-by Dan Williams <[email protected]>
---
This fixes NetworkManager and wpa_supplicant trying to connect to the AP associated with at suspend/hibernate time, which clearly may not exist at the location where the machine is waking up.

Quoted 3 lines

Quoted 1 line
v2: always set suspend_at
Thank you.

Found an issue, plus ieee80211_translate_scan() doesn't handle large unsigned network->last_seen values (leading to stuff like "Last beacon:
-32131218ms ago"), so I'll post a v3 update.

Dan