Commit 4763a752 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Greg Kroah-Hartman

staging: rtl8192u: ieee80211: ieee80211_softmac: Replace MSECS with msecs_to_jiffies

Replace driver specific macro MSECS with msecs_to_jiffies().

This was found using the following Coccinelle semantic patch:

//<smpl>
@@
expression e;
@@

- MSECS(e)
+ msecs_to_jiffies(e)
//</smpl>
Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 69bf7ece
...@@ -380,7 +380,8 @@ static void ieee80211_send_beacon(struct ieee80211_device *ieee) ...@@ -380,7 +380,8 @@ static void ieee80211_send_beacon(struct ieee80211_device *ieee)
if (ieee->beacon_txing && ieee->ieee_up) { if (ieee->beacon_txing && ieee->ieee_up) {
// if(!timer_pending(&ieee->beacon_timer)) // if(!timer_pending(&ieee->beacon_timer))
// add_timer(&ieee->beacon_timer); // add_timer(&ieee->beacon_timer);
mod_timer(&ieee->beacon_timer,jiffies+(MSECS(ieee->current_network.beacon_interval-5))); mod_timer(&ieee->beacon_timer,
jiffies + msecs_to_jiffies(ieee->current_network.beacon_interval-5));
} }
//spin_unlock_irqrestore(&ieee->beacon_lock,flags); //spin_unlock_irqrestore(&ieee->beacon_lock,flags);
} }
...@@ -1735,10 +1736,12 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, ...@@ -1735,10 +1736,12 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h,
if(dtim & ((IEEE80211_DTIM_UCAST | IEEE80211_DTIM_MBCAST)& ieee->ps)) if(dtim & ((IEEE80211_DTIM_UCAST | IEEE80211_DTIM_MBCAST)& ieee->ps))
return 2; return 2;
if(!time_after(jiffies, ieee->dev->trans_start + MSECS(timeout))) if(!time_after(jiffies,
ieee->dev->trans_start + msecs_to_jiffies(timeout)))
return 0; return 0;
if(!time_after(jiffies, ieee->last_rx_ps_time + MSECS(timeout))) if(!time_after(jiffies,
ieee->last_rx_ps_time + msecs_to_jiffies(timeout)))
return 0; return 0;
if((ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE ) && if((ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE ) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment