summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-12 16:41:46 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-02-12 16:41:46 +0100
commit318d86dbe55cbc63a61a83b9ff6cdbc044905f5e (patch)
tree8fb2e044f5ae4d6120304d2f41105cc84af56215 /net/mac80211/cfg.c
parentbridge: set priority of STP packets (diff)
parentmwl8k: fix band for supported channels (diff)
downloadlinux-318d86dbe55cbc63a61a83b9ff6cdbc044905f5e.tar.xz
linux-318d86dbe55cbc63a61a83b9ff6cdbc044905f5e.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 516fbc96feff..0479c64aa83c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2004,7 +2004,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;
}