diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2011-11-28 14:11:18 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-28 14:11:18 -0500 |
| commit | 39338b56382ac640614851a80e0bd71994cc664d (patch) | |
| tree | c319e23181be286b1d320c29f755a81e5ef61172 /drivers/net/wireless/mwifiex/sta_ioctl.c | |
| parent | net/irda: convert drivers/net/irda/* to use module_platform_driver() (diff) | |
| parent | rtlwifi: squash warning in _usb_read_sync (diff) | |
| download | linux-dev-39338b56382ac640614851a80e0bd71994cc664d.tar.xz linux-dev-39338b56382ac640614851a80e0bd71994cc664d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_ioctl.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sta_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c index ea4a29b7e331..4b6f5539657d 100644 --- a/drivers/net/wireless/mwifiex/sta_ioctl.c +++ b/drivers/net/wireless/mwifiex/sta_ioctl.c @@ -832,8 +832,8 @@ int mwifiex_drv_get_data_rate(struct mwifiex_private *priv, if (!ret) { if (rate->is_rate_auto) - rate->rate = mwifiex_index_to_data_rate(priv->tx_rate, - priv->tx_htinfo); + rate->rate = mwifiex_index_to_data_rate(priv, + priv->tx_rate, priv->tx_htinfo); else rate->rate = priv->data_rate; } else { |