korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 18:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

wireless: mwifiex: Use the proper interfaces

Browse Source 
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>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Thomas Gleixner 2014-06-12 08:31:34 +01:00 committed by John W. Linville
parent 057d32f03d
commit c64800e772
5 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/mwifiex/cfg80211.c
View File

@ -121,7 +121,6 @@ mwifiex_form_mgmt_frame(struct sk_buff *skb, const u8 *buf, size_t len)
u8 addr[ETH_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; u8 addr[ETH_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
u16 pkt_len; u16 pkt_len;
u32 tx_control = 0, pkt_type = PKT_TYPE_MGMT; u32 tx_control = 0, pkt_type = PKT_TYPE_MGMT;
struct timeval tv;
pkt_len = len + ETH_ALEN; pkt_len = len + ETH_ALEN;
@ -143,8 +142,7 @@ mwifiex_form_mgmt_frame(struct sk_buff *skb, const u8 *buf, size_t len)
len - sizeof(struct ieee80211_hdr_3addr)); len - sizeof(struct ieee80211_hdr_3addr));
skb->priority = LOW_PRIO_TID; skb->priority = LOW_PRIO_TID;
do_gettimeofday(&tv); __net_timestamp(skb);
skb->tstamp = timeval_to_ktime(tv);
return 0; return 0;
} }

4
drivers/net/wireless/mwifiex/main.c
View File

@ -609,7 +609,6 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
struct sk_buff *new_skb; struct sk_buff *new_skb;
struct mwifiex_txinfo *tx_info; struct mwifiex_txinfo *tx_info;
struct timeval tv;
dev_dbg(priv->adapter->dev, "data: %lu BSS(%d-%d): Data <= kernel\n", dev_dbg(priv->adapter->dev, "data: %lu BSS(%d-%d): Data <= kernel\n",
jiffies, priv->bss_type, priv->bss_num); jiffies, priv->bss_type, priv->bss_num);
@ -656,8 +655,7 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
* firmware for aggregate delay calculation for stats and * firmware for aggregate delay calculation for stats and
* MSDU lifetime expiry. * MSDU lifetime expiry.
*/ */
do_gettimeofday(&tv); __net_timestamp(skb);
skb->tstamp = timeval_to_ktime(tv);
mwifiex_queue_tx_pkt(priv, skb); mwifiex_queue_tx_pkt(priv, skb);

8
drivers/net/wireless/mwifiex/tdls.c
View File

@ -530,7 +530,6 @@ int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer,
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct mwifiex_txinfo *tx_info; struct mwifiex_txinfo *tx_info;
struct timeval tv;
int ret; int ret;
u16 skb_len; u16 skb_len;
@ -608,8 +607,7 @@ int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer,
tx_info->bss_num = priv->bss_num; tx_info->bss_num = priv->bss_num;
tx_info->bss_type = priv->bss_type; tx_info->bss_type = priv->bss_type;
do_gettimeofday(&tv); __net_timestamp(skb);
skb->tstamp = timeval_to_ktime(tv);
mwifiex_queue_tx_pkt(priv, skb); mwifiex_queue_tx_pkt(priv, skb);
return 0; return 0;
@ -702,7 +700,6 @@ int mwifiex_send_tdls_action_frame(struct mwifiex_private *priv, const u8 *peer,
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct mwifiex_txinfo *tx_info; struct mwifiex_txinfo *tx_info;
struct timeval tv;
u8 *pos; u8 *pos;
u32 pkt_type, tx_control; u32 pkt_type, tx_control;
u16 pkt_len, skb_len; u16 pkt_len, skb_len;
@ -767,8 +764,7 @@ 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); pkt_len = skb->len - MWIFIEX_MGMT_FRAME_HEADER_SIZE - sizeof(pkt_len);
memcpy(skb->data + MWIFIEX_MGMT_FRAME_HEADER_SIZE, &pkt_len, memcpy(skb->data + MWIFIEX_MGMT_FRAME_HEADER_SIZE, &pkt_len,
sizeof(pkt_len)); sizeof(pkt_len));
do_gettimeofday(&tv); __net_timestamp(skb);
skb->tstamp = timeval_to_ktime(tv);
mwifiex_queue_tx_pkt(priv, skb); mwifiex_queue_tx_pkt(priv, skb);
return 0; return 0;

4
drivers/net/wireless/mwifiex/uap_txrx.c
View File

@ -96,7 +96,6 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv,
struct sk_buff *new_skb; struct sk_buff *new_skb;
struct mwifiex_txinfo *tx_info; struct mwifiex_txinfo *tx_info;
int hdr_chop; int hdr_chop;
struct timeval tv;
struct ethhdr *p_ethhdr; struct ethhdr *p_ethhdr;
uap_rx_pd = (struct uap_rxpd *)(skb->data); uap_rx_pd = (struct uap_rxpd *)(skb->data);
@ -192,8 +191,7 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv,
tx_info->pkt_len = skb->len; tx_info->pkt_len = skb->len;
} }
do_gettimeofday(&tv); __net_timestamp(skb);
skb->tstamp = timeval_to_ktime(tv);
mwifiex_wmm_add_buf_txqueue(priv, skb); mwifiex_wmm_add_buf_txqueue(priv, skb);
atomic_inc(&adapter->tx_pending); atomic_inc(&adapter->tx_pending);
atomic_inc(&adapter->pending_bridged_pkts); atomic_inc(&adapter->pending_bridged_pkts);

9
drivers/net/wireless/mwifiex/wmm.c
View File

@ -878,15 +878,8 @@ u8
mwifiex_wmm_compute_drv_pkt_delay(struct mwifiex_private *priv, mwifiex_wmm_compute_drv_pkt_delay(struct mwifiex_private *priv,
const struct sk_buff *skb) const struct sk_buff *skb)
{ {
u32 queue_delay = ktime_to_ms(net_timedelta(skb->tstamp));
u8 ret_val; 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 * Queue delay is passed as a uint8 in units of 2ms (ms shifted