summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJohannes Berg2013-02-15 09:41:21 +0100
committerJohannes Berg2013-02-15 09:41:21 +0100
commit8cdc196b743c4224ffa59fef38133559c1fd2a5e (patch)
treef5de9fd936d42150ffdbfdacdbce41c6697acb8b /net/mac80211/cfg.c
parentmac80211: use spin_lock_bh() for TKIP lock (diff)
parentmac80211: fix channel selection bug (diff)
downloadkernel-qcow2-linux-8cdc196b743c4224ffa59fef38133559c1fd2a5e.tar.gz
kernel-qcow2-linux-8cdc196b743c4224ffa59fef38133559c1fd2a5e.tar.xz
kernel-qcow2-linux-8cdc196b743c4224ffa59fef38133559c1fd2a5e.zip
Merge remote-tracking branch 'mac80211/master' into HEAD
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index f4db30624f67..9b179309e073 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2088,7 +2088,8 @@ static int ieee80211_set_mcast_rate(struct wiphy *wiphy, struct net_device *dev,
{
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
- memcpy(sdata->vif.bss_conf.mcast_rate, rate, sizeof(rate));
+ memcpy(sdata->vif.bss_conf.mcast_rate, rate,
+ sizeof(int) * IEEE80211_NUM_BANDS);
return 0;
}