tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mwifiex: Use the proper interfaces

Why is converting time formats so desired if there are proper
interfaces for this?

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Thomas Gleixner and committed by
John W. Linville 6451acdc 2e91606f

+6 -23
+1 -3
drivers/net/wireless/mwifiex/cfg80211.c
··· 121 121 u8 addr[ETH_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; 122 122 u16 pkt_len; 123 123 u32 tx_control = 0, pkt_type = PKT_TYPE_MGMT; 124 - struct timeval tv; 125 124 126 125 pkt_len = len + ETH_ALEN; 127 126 ··· 142 143 len - sizeof(struct ieee80211_hdr_3addr)); 143 144 144 145 skb->priority = LOW_PRIO_TID; 145 - do_gettimeofday(&tv); 146 - skb->tstamp = timeval_to_ktime(tv); 146 + __net_timestamp(skb); 147 147 148 148 return 0; 149 149 }
+1 -3
drivers/net/wireless/mwifiex/main.c
··· 609 609 struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); 610 610 struct sk_buff *new_skb; 611 611 struct mwifiex_txinfo *tx_info; 612 - struct timeval tv; 613 612 614 613 dev_dbg(priv->adapter->dev, "data: %lu BSS(%d-%d): Data <= kernel\n", 615 614 jiffies, priv->bss_type, priv->bss_num); ··· 655 656 * firmware for aggregate delay calculation for stats and 656 657 * MSDU lifetime expiry. 657 658 */ 658 - do_gettimeofday(&tv); 659 - skb->tstamp = timeval_to_ktime(tv); 659 + __net_timestamp(skb); 660 660 661 661 mwifiex_queue_tx_pkt(priv, skb); 662 662
+2 -6
drivers/net/wireless/mwifiex/tdls.c
··· 530 530 { 531 531 struct sk_buff *skb; 532 532 struct mwifiex_txinfo *tx_info; 533 - struct timeval tv; 534 533 int ret; 535 534 u16 skb_len; 536 535 ··· 607 608 tx_info->bss_num = priv->bss_num; 608 609 tx_info->bss_type = priv->bss_type; 609 610 610 - do_gettimeofday(&tv); 611 - skb->tstamp = timeval_to_ktime(tv); 611 + __net_timestamp(skb); 612 612 mwifiex_queue_tx_pkt(priv, skb); 613 613 614 614 return 0; ··· 700 702 { 701 703 struct sk_buff *skb; 702 704 struct mwifiex_txinfo *tx_info; 703 - struct timeval tv; 704 705 u8 *pos; 705 706 u32 pkt_type, tx_control; 706 707 u16 pkt_len, skb_len; ··· 764 767 pkt_len = skb->len - MWIFIEX_MGMT_FRAME_HEADER_SIZE - sizeof(pkt_len); 765 768 memcpy(skb->data + MWIFIEX_MGMT_FRAME_HEADER_SIZE, &pkt_len, 766 769 sizeof(pkt_len)); 767 - do_gettimeofday(&tv); 768 - skb->tstamp = timeval_to_ktime(tv); 770 + __net_timestamp(skb); 769 771 mwifiex_queue_tx_pkt(priv, skb); 770 772 771 773 return 0;
+1 -3
drivers/net/wireless/mwifiex/uap_txrx.c
··· 96 96 struct sk_buff *new_skb; 97 97 struct mwifiex_txinfo *tx_info; 98 98 int hdr_chop; 99 - struct timeval tv; 100 99 struct ethhdr *p_ethhdr; 101 100 102 101 uap_rx_pd = (struct uap_rxpd *)(skb->data); ··· 191 192 tx_info->pkt_len = skb->len; 192 193 } 193 194 194 - do_gettimeofday(&tv); 195 - skb->tstamp = timeval_to_ktime(tv); 195 + __net_timestamp(skb); 196 196 mwifiex_wmm_add_buf_txqueue(priv, skb); 197 197 atomic_inc(&adapter->tx_pending); 198 198 atomic_inc(&adapter->pending_bridged_pkts);
+1 -8
drivers/net/wireless/mwifiex/wmm.c
··· 878 878 mwifiex_wmm_compute_drv_pkt_delay(struct mwifiex_private *priv, 879 879 const struct sk_buff *skb) 880 880 { 881 + u32 queue_delay = ktime_to_ms(ktime_sub(ktime_get(), skb->tstamp)); 881 882 u8 ret_val; 882 - struct timeval out_tstamp, in_tstamp; 883 - u32 queue_delay; 884 - 885 - do_gettimeofday(&out_tstamp); 886 - in_tstamp = ktime_to_timeval(skb->tstamp); 887 - 888 - queue_delay = (out_tstamp.tv_sec - in_tstamp.tv_sec) * 1000; 889 - queue_delay += (out_tstamp.tv_usec - in_tstamp.tv_usec) / 1000; 890 883 891 884 /* 892 885 * Queue delay is passed as a uint8 in units of 2ms (ms shifted