Revert "mwifiex: Use the proper interfaces"

This reverts commit a82fc3b4a2bceb7c6587249cb690342eb5065979.

Thomas corrected me on that I misunderstood Johannes' comment
for net_timedelta() and the ktime_get_real() usage inside
__net_timestamp().

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 15fa7b453372e76af91802c3efb295a57ded50b7..44b8f4ab3b35d0a8d2691f6815107c732f87c5a4 100644 (file)
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -121,6 +121,7 @@ mwifiex_form_mgmt_frame(struct sk_buff *skb, const u8 *buf, size_t len)
        u8 addr[ETH_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
        u16 pkt_len;
        u32 tx_control = 0, pkt_type = PKT_TYPE_MGMT;
+       struct timeval tv;
 
        pkt_len = len + ETH_ALEN;
 
@@ -142,7 +143,8 @@ mwifiex_form_mgmt_frame(struct sk_buff *skb, const u8 *buf, size_t len)
               len - sizeof(struct ieee80211_hdr_3addr));
 
        skb->priority = LOW_PRIO_TID;
-       __net_timestamp(skb);
+       do_gettimeofday(&tv);
+       skb->tstamp = timeval_to_ktime(tv);
 
        return 0;
 }

diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 657504c3c79dbbdfd0ce666aa76158bd913952ff..1261d9a41e11328617acd267d80b6f7968149d4a 100644 (file)
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -609,6 +609,7 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
        struct sk_buff *new_skb;
        struct mwifiex_txinfo *tx_info;
+       struct timeval tv;
 
        dev_dbg(priv->adapter->dev, "data: %lu BSS(%d-%d): Data <= kernel\n",
                jiffies, priv->bss_type, priv->bss_num);
@@ -655,7 +656,8 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         * firmware for aggregate delay calculation for stats and
         * MSDU lifetime expiry.
         */
-       __net_timestamp(skb);
+       do_gettimeofday(&tv);
+       skb->tstamp = timeval_to_ktime(tv);
 
        mwifiex_queue_tx_pkt(priv, skb);
 

diff --git a/drivers/net/wireless/mwifiex/tdls.c b/drivers/net/wireless/mwifiex/tdls.c
index 3efbcbe7e891cc18c5098c84c5216073ee583aed..e73034fbbde9263b8e234ee7cd7747a1404c8a40 100644 (file)
--- a/drivers/net/wireless/mwifiex/tdls.c
+++ b/drivers/net/wireless/mwifiex/tdls.c
@@ -530,6 +530,7 @@ int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer,
 {
        struct sk_buff *skb;
        struct mwifiex_txinfo *tx_info;
+       struct timeval tv;
        int ret;
        u16 skb_len;
 
@@ -607,7 +608,8 @@ int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer,
        tx_info->bss_num = priv->bss_num;
        tx_info->bss_type = priv->bss_type;
 
-       __net_timestamp(skb);
+       do_gettimeofday(&tv);
+       skb->tstamp = timeval_to_ktime(tv);
        mwifiex_queue_tx_pkt(priv, skb);
 
        return 0;
@@ -700,6 +702,7 @@ int mwifiex_send_tdls_action_frame(struct mwifiex_private *priv, const u8 *peer,
 {
        struct sk_buff *skb;
        struct mwifiex_txinfo *tx_info;
+       struct timeval tv;
        u8 *pos;
        u32 pkt_type, tx_control;
        u16 pkt_len, skb_len;
@@ -764,7 +767,8 @@ int mwifiex_send_tdls_action_frame(struct mwifiex_private *priv, const u8 *peer,
        pkt_len = skb->len - MWIFIEX_MGMT_FRAME_HEADER_SIZE - sizeof(pkt_len);
        memcpy(skb->data + MWIFIEX_MGMT_FRAME_HEADER_SIZE, &pkt_len,
               sizeof(pkt_len));
-       __net_timestamp(skb);
+       do_gettimeofday(&tv);
+       skb->tstamp = timeval_to_ktime(tv);
        mwifiex_queue_tx_pkt(priv, skb);
 
        return 0;

diff --git a/drivers/net/wireless/mwifiex/uap_txrx.c b/drivers/net/wireless/mwifiex/uap_txrx.c
index ddfc3c6c1e78b6f5d5c3c89768960e1ecf49fe8b..57fa47d2c6167bfba1352b93930719541cb7fa33 100644 (file)
--- a/drivers/net/wireless/mwifiex/uap_txrx.c
+++ b/drivers/net/wireless/mwifiex/uap_txrx.c
@@ -96,6 +96,7 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv,
        struct sk_buff *new_skb;
        struct mwifiex_txinfo *tx_info;
        int hdr_chop;
+       struct timeval tv;
        struct ethhdr *p_ethhdr;
 
        uap_rx_pd = (struct uap_rxpd *)(skb->data);
@@ -191,7 +192,8 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv,
                tx_info->pkt_len = skb->len;
        }
 
-       __net_timestamp(skb);
+       do_gettimeofday(&tv);
+       skb->tstamp = timeval_to_ktime(tv);
        mwifiex_wmm_add_buf_txqueue(priv, skb);
        atomic_inc(&adapter->tx_pending);
        atomic_inc(&adapter->pending_bridged_pkts);

diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index e8556b6e04ee77906eb5df183b1abb4f02271966..8cd123ecebbfcad637d3cfcbae16b623aec54c67 100644 (file)
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -878,8 +878,15 @@ u8
 mwifiex_wmm_compute_drv_pkt_delay(struct mwifiex_private *priv,
                                  const struct sk_buff *skb)
 {
-       u32 queue_delay = ktime_to_ms(ktime_sub(ktime_get(), skb->tstamp));
        u8 ret_val;
+       struct timeval out_tstamp, in_tstamp;
+       u32 queue_delay;
+
+       do_gettimeofday(&out_tstamp);
+       in_tstamp = ktime_to_timeval(skb->tstamp);
+
+       queue_delay = (out_tstamp.tv_sec - in_tstamp.tv_sec) * 1000;
+       queue_delay += (out_tstamp.tv_usec - in_tstamp.tv_usec) / 1000;
 
        /*
         * Queue delay is passed as a uint8 in units of 2ms (ms shifted