From afef4bc8bf864fcadb5750f8f6185c0fe8ecb646 Mon Sep 17 00:00:00 2001 From: LEO Airwarosu Yoichi Shinoda Date: Mon, 27 Aug 2012 22:28:16 +0900 Subject: [PATCH] --- yaml --- r: 322767 b: refs/heads/master c: 7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c h: refs/heads/master i: 322765: 6d3e2ffa5d72887cb8cae56a6b6e1734a0872bee 322763: 746181afd0c0ee871b3c1d5252d11c8bf57a94fa 322759: 2fb39dc66a92d0ce9f813e7038c2a17ed82ef756 322751: 81b835fb8dd67e83d1cde236c97c297274b6338f v: v3 --- [refs] | 2 +- trunk/net/mac80211/cfg.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f6781ce332c4..e120bad012b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4e4f47e940bc93c5b1125a4429ff53956754800 +refs/heads/master: 7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c index d41974aacf51..a58c0b649ba1 100644 --- a/trunk/net/mac80211/cfg.c +++ b/trunk/net/mac80211/cfg.c @@ -1378,6 +1378,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, else memset(next_hop, 0, ETH_ALEN); + memset(pinfo, 0, sizeof(*pinfo)); + pinfo->generation = mesh_paths_generation; pinfo->filled = MPATH_INFO_FRAME_QLEN | @@ -1396,7 +1398,6 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, pinfo->discovery_timeout = jiffies_to_msecs(mpath->discovery_timeout); pinfo->discovery_retries = mpath->discovery_retries; - pinfo->flags = 0; if (mpath->flags & MESH_PATH_ACTIVE) pinfo->flags |= NL80211_MPATH_FLAG_ACTIVE; if (mpath->flags & MESH_PATH_RESOLVING) @@ -1405,10 +1406,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, pinfo->flags |= NL80211_MPATH_FLAG_SN_VALID; if (mpath->flags & MESH_PATH_FIXED) pinfo->flags |= NL80211_MPATH_FLAG_FIXED; - if (mpath->flags & MESH_PATH_RESOLVING) - pinfo->flags |= NL80211_MPATH_FLAG_RESOLVING; - - pinfo->flags = mpath->flags; + if (mpath->flags & MESH_PATH_RESOLVED) + pinfo->flags |= NL80211_MPATH_FLAG_RESOLVED; } static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev,