2008-12-16 20:38:32

by Rami Rosen

[permalink] [raw]
Subject: [PATCH] mac80211: fix an error in ieee80211_send_assoc() method.

This patch fixes an error in ieee80211_send_assoc(), net/mac80211/mlme.c.

The error is usage of a wrong member when building
the ie80211 management frame (it should be assoc_req, and not reassoc_req).

This error is due to commit ea95bba41e69c616bb1512cf59d22f33266b8568,
which dealt with configuring a listen interval , from Jul 18, 2008.

(wireless-testing)

Signed-off-by: Rami Rosen <[email protected]>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9a06905..829cdf8 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -309,7 +309,7 @@ static void ieee80211_send_assoc(struct
ieee80211_sub_if_data *sdata,
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ASSOC_REQ);
mgmt->u.assoc_req.capab_info = cpu_to_le16(capab);
- mgmt->u.reassoc_req.listen_interval =
+ mgmt->u.assoc_req.listen_interval =
cpu_to_le16(local->hw.conf.listen_interval);
}


2008-12-16 20:43:14

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] mac80211: fix an error in ieee80211_send_assoc() method.

On Tue, 2008-12-16 at 22:38 +0200, Rami Rosen wrote:
> This patch fixes an error in ieee80211_send_assoc(), net/mac80211/mlme.c.
>
> The error is usage of a wrong member when building
> the ie80211 management frame (it should be assoc_req, and not reassoc_req).
>
> This error is due to commit ea95bba41e69c616bb1512cf59d22f33266b8568,
> which dealt with configuring a listen interval , from Jul 18, 2008.

> - mgmt->u.reassoc_req.listen_interval =
> + mgmt->u.assoc_req.listen_interval =
> cpu_to_le16(local->hw.conf.listen_interval);

Seems fine, but, uh, it's not a bug.

johannes


Attachments:
signature.asc (836.00 B)
This is a digitally signed message part