From: Janusz Dziedzic Date: Tue, 3 Dec 2013 08:50:44 +0000 (+0100) Subject: nl80211: don't clear bitrate_mask twice X-Git-Tag: v3.14-rc1~94^2~3^2^2~215 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7869303b17a3cc78c9e9f26544be98b5734ac97c;p=platform%2Fkernel%2Flinux-stable.git nl80211: don't clear bitrate_mask twice Don't clear cfg80211_bitrate_mask twice in nl80211_set_tx_bitrate_mask() function. Signed-off-by: Janusz Dziedzic Signed-off-by: Johannes Berg --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 9cd8c61..bdcf256 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -7349,15 +7349,14 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb, /* Default to all rates enabled */ for (i = 0; i < IEEE80211_NUM_BANDS; i++) { sband = rdev->wiphy.bands[i]; - mask.control[i].legacy = - sband ? (1 << sband->n_bitrates) - 1 : 0; - if (sband) - memcpy(mask.control[i].mcs, - sband->ht_cap.mcs.rx_mask, - sizeof(mask.control[i].mcs)); - else - memset(mask.control[i].mcs, 0, - sizeof(mask.control[i].mcs)); + + if (!sband) + continue; + + mask.control[i].legacy = (1 << sband->n_bitrates) - 1; + memcpy(mask.control[i].mcs, + sband->ht_cap.mcs.rx_mask, + sizeof(mask.control[i].mcs)); } /*