Commit e7dee444 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville

rt2x00: Implement get_ringparam callback function

With the get_ringparam callback function we can export ring parameters
to ethtool through the mac80211 interface.
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8d0a2dcf
...@@ -1720,6 +1720,7 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = { ...@@ -1720,6 +1720,7 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = {
.tx_last_beacon = rt2400pci_tx_last_beacon, .tx_last_beacon = rt2400pci_tx_last_beacon,
.rfkill_poll = rt2x00mac_rfkill_poll, .rfkill_poll = rt2x00mac_rfkill_poll,
.flush = rt2x00mac_flush, .flush = rt2x00mac_flush,
.get_ringparam = rt2x00mac_get_ringparam,
}; };
static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = { static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
......
...@@ -2013,6 +2013,7 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = { ...@@ -2013,6 +2013,7 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = {
.tx_last_beacon = rt2500pci_tx_last_beacon, .tx_last_beacon = rt2500pci_tx_last_beacon,
.rfkill_poll = rt2x00mac_rfkill_poll, .rfkill_poll = rt2x00mac_rfkill_poll,
.flush = rt2x00mac_flush, .flush = rt2x00mac_flush,
.get_ringparam = rt2x00mac_get_ringparam,
}; };
static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
......
...@@ -1823,6 +1823,7 @@ static const struct ieee80211_ops rt2500usb_mac80211_ops = { ...@@ -1823,6 +1823,7 @@ static const struct ieee80211_ops rt2500usb_mac80211_ops = {
.conf_tx = rt2x00mac_conf_tx, .conf_tx = rt2x00mac_conf_tx,
.rfkill_poll = rt2x00mac_rfkill_poll, .rfkill_poll = rt2x00mac_rfkill_poll,
.flush = rt2x00mac_flush, .flush = rt2x00mac_flush,
.get_ringparam = rt2x00mac_get_ringparam,
}; };
static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = { static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = {
......
...@@ -1028,6 +1028,7 @@ static const struct ieee80211_ops rt2800pci_mac80211_ops = { ...@@ -1028,6 +1028,7 @@ static const struct ieee80211_ops rt2800pci_mac80211_ops = {
.ampdu_action = rt2800_ampdu_action, .ampdu_action = rt2800_ampdu_action,
.flush = rt2x00mac_flush, .flush = rt2x00mac_flush,
.get_survey = rt2800_get_survey, .get_survey = rt2800_get_survey,
.get_ringparam = rt2x00mac_get_ringparam,
}; };
static const struct rt2800_ops rt2800pci_rt2800_ops = { static const struct rt2800_ops rt2800pci_rt2800_ops = {
......
...@@ -673,6 +673,7 @@ static const struct ieee80211_ops rt2800usb_mac80211_ops = { ...@@ -673,6 +673,7 @@ static const struct ieee80211_ops rt2800usb_mac80211_ops = {
.ampdu_action = rt2800_ampdu_action, .ampdu_action = rt2800_ampdu_action,
.flush = rt2x00mac_flush, .flush = rt2x00mac_flush,
.get_survey = rt2800_get_survey, .get_survey = rt2800_get_survey,
.get_ringparam = rt2x00mac_get_ringparam,
}; };
static const struct rt2800_ops rt2800usb_rt2800_ops = { static const struct rt2800_ops rt2800usb_rt2800_ops = {
......
...@@ -1254,6 +1254,8 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw, u16 queue, ...@@ -1254,6 +1254,8 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params); const struct ieee80211_tx_queue_params *params);
void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw); void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw);
void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop); void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop);
void rt2x00mac_get_ringparam(struct ieee80211_hw *hw,
u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max);
/* /*
* Driver allocation handlers. * Driver allocation handlers.
......
...@@ -737,3 +737,19 @@ void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop) ...@@ -737,3 +737,19 @@ void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop)
rt2x00queue_flush_queue(queue, drop); rt2x00queue_flush_queue(queue, drop);
} }
EXPORT_SYMBOL_GPL(rt2x00mac_flush); EXPORT_SYMBOL_GPL(rt2x00mac_flush);
void rt2x00mac_get_ringparam(struct ieee80211_hw *hw,
u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max)
{
struct rt2x00_dev *rt2x00dev = hw->priv;
struct data_queue *queue;
tx_queue_for_each(rt2x00dev, queue) {
*tx += queue->length;
*tx_max += queue->limit;
}
*rx = rt2x00dev->rx->length;
*rx_max = rt2x00dev->rx->limit;
}
EXPORT_SYMBOL_GPL(rt2x00mac_get_ringparam);
...@@ -2979,6 +2979,7 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = { ...@@ -2979,6 +2979,7 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = {
.get_tsf = rt61pci_get_tsf, .get_tsf = rt61pci_get_tsf,
.rfkill_poll = rt2x00mac_rfkill_poll, .rfkill_poll = rt2x00mac_rfkill_poll,
.flush = rt2x00mac_flush, .flush = rt2x00mac_flush,
.get_ringparam = rt2x00mac_get_ringparam,
}; };
static const struct rt2x00lib_ops rt61pci_rt2x00_ops = { static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
......
...@@ -2310,6 +2310,7 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = { ...@@ -2310,6 +2310,7 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = {
.get_tsf = rt73usb_get_tsf, .get_tsf = rt73usb_get_tsf,
.rfkill_poll = rt2x00mac_rfkill_poll, .rfkill_poll = rt2x00mac_rfkill_poll,
.flush = rt2x00mac_flush, .flush = rt2x00mac_flush,
.get_ringparam = rt2x00mac_get_ringparam,
}; };
static const struct rt2x00lib_ops rt73usb_rt2x00_ops = { static const struct rt2x00lib_ops rt73usb_rt2x00_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment