diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 03:41:21 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 03:41:21 -0500 |
| commit | 8cdc196b743c4224ffa59fef38133559c1fd2a5e (patch) | |
| tree | f5de9fd936d42150ffdbfdacdbce41c6697acb8b /net/mac80211/cfg.c | |
| parent | 03395003bf8ac813b1a0ac9299b3496484caf228 (diff) | |
| parent | 3d9646d0abd02c552f6f15c302b31aa321c2fa8b (diff) | |
Merge remote-tracking branch 'mac80211/master' into HEAD
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 3 |
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, | |||
| 2088 | { | 2088 | { |
| 2089 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 2089 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
| 2090 | 2090 | ||
| 2091 | memcpy(sdata->vif.bss_conf.mcast_rate, rate, sizeof(rate)); | 2091 | memcpy(sdata->vif.bss_conf.mcast_rate, rate, |
| 2092 | sizeof(int) * IEEE80211_NUM_BANDS); | ||
| 2092 | 2093 | ||
| 2093 | return 0; | 2094 | return 0; |
| 2094 | } | 2095 | } |