Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / drivers / net / wireless / intersil / p54 / txrx.c

diff --git a/drivers/net/wireless/intersil/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c
index be6968454282204bfb81f2bfef6e42b4f972fee2..873fea59894fccc6229a38fc3ed4eef41f332436 100644 (file)
--- a/drivers/net/wireless/intersil/p54/txrx.c
+++ b/drivers/net/wireless/intersil/p54/txrx.c
@@ -383,7 +383,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb)
 
        fc = ((struct ieee80211_hdr *)skb->data)->frame_control;
        if (ieee80211_is_probe_resp(fc) || ieee80211_is_beacon(fc))
-               rx_status->boottime_ns = ktime_get_boot_ns();
+               rx_status->boottime_ns = ktime_get_boottime_ns();
 
        if (unlikely(priv->hw->conf.flags & IEEE80211_CONF_PS))
                p54_pspoll_workaround(priv, skb);