| Message ID | 1482769056-28577-1-git-send-email-ilan.peer@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
On 2016年12月27日 01:17, Ilan Peer wrote: > The code was setting the capabilities byte to zero, > after it was already properly set previously. Fix it. > > The bug was found while debugging hwsim mesh tests failures > that happened in commit 76f43b4 (mac80211: Remove invalid flag > operations in mesh TSF synchronization). Thanks! Reviewed-by: Masashi Honma <masashi.honma@gmail.com>
On Mon, 2016-12-26 at 18:17 +0200, Ilan Peer wrote: > The code was setting the capabilities byte to zero, > after it was already properly set previously. Fix it. > > The bug was found while debugging hwsim mesh tests failures > that happened in commit 76f43b4 (mac80211: Remove invalid flag > operations in mesh TSF synchronization). > Applied, thanks. When you have the commit already, please add a Fixes tag, and also use 12 hex digits to abbreviate SHA1s please. (I've done that now) johannes
> -----Original Message----- > From: Johannes Berg [mailto:johannes@sipsolutions.net] > Sent: Monday, January 02, 2017 13:00 > To: Peer, Ilan <ilan.peer@intel.com> > Cc: linux-wireless@vger.kernel.org; masashi.honma@gmail.com > Subject: Re: [PATCH] mac80211: Fix addition of mesh configuration element > > On Mon, 2016-12-26 at 18:17 +0200, Ilan Peer wrote: > > The code was setting the capabilities byte to zero, after it was > > already properly set previously. Fix it. > > > > The bug was found while debugging hwsim mesh tests failures that > > happened in commit 76f43b4 (mac80211: Remove invalid flag operations > > in mesh TSF synchronization). > > > Applied, thanks. > > When you have the commit already, please add a Fixes tag, and also use > 12 hex digits to abbreviate SHA1s please. (I've done that now) > Sure. Thanks. Ilan.
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index cc2a63b..9c23172 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -279,8 +279,6 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata, /* Mesh PS mode. See IEEE802.11-2012 8.4.2.100.8 */ *pos |= ifmsh->ps_peers_deep_sleep ? IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL : 0x00; - *pos++ = 0x00; - return 0; }
The code was setting the capabilities byte to zero, after it was already properly set previously. Fix it. The bug was found while debugging hwsim mesh tests failures that happened in commit 76f43b4 (mac80211: Remove invalid flag operations in mesh TSF synchronization). Signed-off-by: Ilan Peer <ilan.peer@intel.com> --- net/mac80211/mesh.c | 2 -- 1 file changed, 2 deletions(-)