diff --git a/[refs] b/[refs] index ae9916aba5fd..db780cc2c849 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73ec1cc28ebc7854a376cde53f62d487e127fbca +refs/heads/master: 135541215ca87ff00c269e65bcaef0bdcb99aab9 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index a444b38f4901..1374b8c750ab 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/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); }