diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-01 20:34:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-01 20:34:14 -0400 |
| commit | 05318bc905467237d4aa68a701f6e92a2b332218 (patch) | |
| tree | 3b7577383bca50aeb442568aa16cf8f2167b8694 /net/mac80211/rc80211_minstrel_ht.c | |
| parent | ea812ca1b06113597adcd8e70c0f84a413d97544 (diff) | |
| parent | 88c1f4f6dffe66e2fed8e7e3276e091ee850bed0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/libertas/host.h
Diffstat (limited to 'net/mac80211/rc80211_minstrel_ht.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 7a04951fcb1f..52c85036660d 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c | |||
| @@ -328,7 +328,8 @@ minstrel_next_sample_idx(struct minstrel_ht_sta *mi) | |||
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | static void | 330 | static void |
| 331 | minstrel_downgrade_rate(struct minstrel_ht_sta *mi, int *idx, bool primary) | 331 | minstrel_downgrade_rate(struct minstrel_ht_sta *mi, unsigned int *idx, |
| 332 | bool primary) | ||
| 332 | { | 333 | { |
| 333 | int group, orig_group; | 334 | int group, orig_group; |
| 334 | 335 | ||