Merge remote-tracking branch 'mac80211/master' into HEAD

2013-02-15 09:41:21 +01:00
parent 03395003bf 3d9646d0ab
commit 8cdc196b74
3 changed files with 10 additions and 6 deletions
--- 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;
 }