orinoco: always use latest BSS info when caching scan results

PATCH New Dan Williams 1 participant 1 message Dec 5, 2007 Networking drivers (wireless)

Share & tools

Dan Williams

author

2007-12-05 16:07 UTC #0 lore raw

PATCH 1/1 orinoco: always use latest BSS info when caching scan results

Always copy the latest BSS information from the firmware's results to the driver's BSS table to ensure that everything is up-to-date (IEs, supported rates, encryption status, etc).

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

drivers/net/wireless/orinoco.c +7 -4

index 100ae33..cd9e0c7 100644
@@ -1194,7 +1208,7 @@ static int orinoco_process_scan_results(struct net_device *dev,
 	/* Read the entries one by one */
 	for (; offset + atom_len <= len; offset += atom_len) {
 		int found = 0;
-		bss_element *bss;
+		bss_element *bss = NULL;
 
 		/* Get next atom */
 		atom = (union hermes_scan_info *) (buf + offset);

@@ -1209,7 +1223,6 @@ static int orinoco_process_scan_results(struct net_device *dev,
 			if (memcmp(bss->bss.a.essid, atom->a.essid,
 			      le16_to_cpu(atom->a.essid_len)))
 				continue;
-			bss->last_scanned = jiffies;
 			found = 1;
 			break;
 		}

@@ -1220,10 +1233,14 @@ static int orinoco_process_scan_results(struct net_device *dev,
 					 bss_element, list);
 			list_del(priv->bss_free_list.next);
 
-			memcpy(bss, atom, sizeof(bss->bss));
-			bss->last_scanned = jiffies;
 			list_add_tail(&bss->list, &priv->bss_list);
 		}
+
+		if (bss) {
+			/* Always update the BSS to get latest beacon info */
+			memcpy(&bss->bss, atom, sizeof(bss->bss));
+			bss->last_scanned = jiffies;
+		}
 	}
 
 	return 0;