Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67a55330 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by John W. Linville
Browse files

ath9k: set 5/10 MHz supported channels and fix bitrate 



Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarMathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f819c0e7

drivers/net/wireless/ath/ath9k/init.c

+16 −8
Original line number Diff line number Diff line
@@ -146,14 +146,22 @@ static struct ieee80211_rate ath9k_legacy_rates[] = { 
	RATE(20, 0x1a, IEEE80211_RATE_SHORT_PREAMBLE),

	RATE(55, 0x19, IEEE80211_RATE_SHORT_PREAMBLE),

	RATE(110, 0x18, IEEE80211_RATE_SHORT_PREAMBLE),

	RATE(60, 0x0b, 0),

	RATE(90, 0x0f, 0),

	RATE(120, 0x0a, 0),

	RATE(180, 0x0e, 0),

	RATE(240, 0x09, 0),

	RATE(360, 0x0d, 0),

	RATE(480, 0x08, 0),

	RATE(540, 0x0c, 0),

	RATE(60, 0x0b, (IEEE80211_RATE_SUPPORTS_5MHZ |

			IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(90, 0x0f, (IEEE80211_RATE_SUPPORTS_5MHZ |

			IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(120, 0x0a, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(180, 0x0e, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(240, 0x09, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(360, 0x0d, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(480, 0x08, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

	RATE(540, 0x0c, (IEEE80211_RATE_SUPPORTS_5MHZ |

			 IEEE80211_RATE_SUPPORTS_10MHZ)),

};



#ifdef CONFIG_MAC80211_LEDS

drivers/net/wireless/ath/ath9k/rc.c

+5 −0
Original line number Diff line number Diff line
@@ -1282,9 +1282,14 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband, 
	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	struct ath_rate_priv *ath_rc_priv = priv_sta;

	int i, j = 0;

	u32 rate_flags = ieee80211_chandef_rate_flags(&sc->hw->conf.chandef);



	for (i = 0; i < sband->n_bitrates; i++) {

		if (sta->supp_rates[sband->band] & BIT(i)) {

			if ((rate_flags & sband->bitrates[i].flags)

			    != rate_flags)

				continue;



			ath_rc_priv->neg_rates.rs_rates[j]

				= (sband->bitrates[i].bitrate * 2) / 10;

			j++;