---

yaml --- r: 265501 b: refs/heads/master c: f612ced h: refs/heads/master i: 265499: 8713776 v: v3
git-mirror · Aug 11, 2011 · 503f1bc · 503f1bc
1 parent 45a5c42
commit 503f1bc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 040bdf713d2bec8235f1af705e2d13da5d9baec8
+refs/heads/master: f612cedfe152b536197c0120f2e7779bc90219d0
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
@@ -563,6 +563,11 @@ struct station_info {
 
 	const u8 *assoc_req_ies;
 	size_t assoc_req_ies_len;
+
+	/*
+	 * Note: Add a new enum station_info_flags value for each new field and
+	 * use it to check which fields are initialized.
+	 */
 };
 
 /**

diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c
@@ -330,6 +330,7 @@ static int sta_info_finish_insert(struct sta_info *sta, bool async)
 	ieee80211_sta_debugfs_add(sta);
 	rate_control_add_sta_debugfs(sta);
 
+	memset(&sinfo, 0, sizeof(sinfo));
 	sinfo.filled = 0;
 	sinfo.generation = local->sta_generation;
 	cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);

diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
@@ -2267,6 +2267,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
 	}
 
 	while (1) {
+		memset(&sinfo, 0, sizeof(sinfo));
 		err = dev->ops->dump_station(&dev->wiphy, netdev, sta_idx,
 					     mac_addr, &sinfo);
 		if (err == -ENOENT)