]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Staging: rtl8712: Use mod_timer
authorVaishali Thakkar <vthakkar1994@gmail.com>
Wed, 25 Feb 2015 04:05:32 +0000 (09:35 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Feb 2015 23:11:22 +0000 (15:11 -0800)
This patch introduces the use of API function mod_timer
instead of driver specific function as it is a more
efficient and standard way to update the expire field of
an active timer.

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/rtl871x_ioctl_linux.c

index 9bb364f04fd49b59152fd0e792e33f161b937ee3..5d4470a9aeb5d447926e1ab0d85f00c8efe8bf06 100644 (file)
@@ -129,7 +129,8 @@ static inline void handle_pairwise_key(struct sta_info *psta,
                memcpy(psta->tkiprxmickey. skey, &(param->u.crypt.
                        key[24]), 8);
                padapter->securitypriv. busetkipkey = false;
-               _set_timer(&padapter->securitypriv.tkip_timer, 50);
+               mod_timer(&padapter->securitypriv.tkip_timer,
+                         jiffies + msecs_to_jiffies(50));
        }
        r8712_setstakey_cmd(padapter, (unsigned char *)psta, true);
 }
@@ -153,8 +154,8 @@ static inline void handle_group_key(struct ieee_param *param,
                if (padapter->registrypriv.power_mgnt > PS_MODE_ACTIVE) {
                        if (padapter->registrypriv.power_mgnt != padapter->
                            pwrctrlpriv.pwr_mode)
-                               _set_timer(&(padapter->mlmepriv.dhcp_timer),
-                                          60000);
+                               mod_timer(&padapter->mlmepriv.dhcp_timer,
+                                         jiffies + msecs_to_jiffies(60000));
                }
        }
 }