aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2010-01-26 18:45:28 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-01-27 15:02:08 -0500
commit22e16e55e36ab91148592c9bf0f2444bf766cd3c (patch)
tree84ea8db07e5b1f483687c1865083903e2e2d1853 /drivers
parentda8604757b1cdf79f24e118b156349543eb1b722 (diff)
rtl8187: Add callback for get_tsf
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Acked-by: Hin-Tak Leung <htl10@users.sourceforge.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/rtl818x/rtl8187_dev.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index f336c63053c1..a05382557789 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -1265,6 +1265,14 @@ static int rtl8187_conf_tx(struct ieee80211_hw *dev, u16 queue,
1265 return 0; 1265 return 0;
1266} 1266}
1267 1267
1268static u64 rtl8187_get_tsf(struct ieee80211_hw *dev)
1269{
1270 struct rtl8187_priv *priv = dev->priv;
1271
1272 return rtl818x_ioread32(priv, &priv->map->TSFT[0]) |
1273 (u64)(rtl818x_ioread32(priv, &priv->map->TSFT[1])) << 32;
1274}
1275
1268static const struct ieee80211_ops rtl8187_ops = { 1276static const struct ieee80211_ops rtl8187_ops = {
1269 .tx = rtl8187_tx, 1277 .tx = rtl8187_tx,
1270 .start = rtl8187_start, 1278 .start = rtl8187_start,
@@ -1276,7 +1284,8 @@ static const struct ieee80211_ops rtl8187_ops = {
1276 .prepare_multicast = rtl8187_prepare_multicast, 1284 .prepare_multicast = rtl8187_prepare_multicast,
1277 .configure_filter = rtl8187_configure_filter, 1285 .configure_filter = rtl8187_configure_filter,
1278 .conf_tx = rtl8187_conf_tx, 1286 .conf_tx = rtl8187_conf_tx,
1279 .rfkill_poll = rtl8187_rfkill_poll 1287 .rfkill_poll = rtl8187_rfkill_poll,
1288 .get_tsf = rtl8187_get_tsf,
1280}; 1289};
1281 1290
1282static void rtl8187_eeprom_register_read(struct eeprom_93cx6 *eeprom) 1291static void rtl8187_eeprom_register_read(struct eeprom_93cx6 *eeprom)