Commit b36b9735 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename timeout related macros 



Rename timeout related macros to have their unit clear from their name.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96ce4f83

drivers/staging/wilc1000/host_interface.c

+4 −4
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 


#include "wilc_wfi_netdevice.h"



#define HOST_IF_SCAN_TIMEOUT                    4000

#define HOST_IF_CONNECT_TIMEOUT                 9500

#define WILC_HIF_SCAN_TIMEOUT_MS                4000

#define WILC_HIF_CONNECT_TIMEOUT_MS             9500



#define FALSE_FRMWR_CHANNEL			100
@@ -327,7 +327,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type, 
	hif_drv->usr_scan_req.arg = user_arg;

	hif_drv->scan_timer_vif = vif;

	mod_timer(&hif_drv->scan_timer,

		  jiffies + msecs_to_jiffies(HOST_IF_SCAN_TIMEOUT));

		  jiffies + msecs_to_jiffies(WILC_HIF_SCAN_TIMEOUT_MS));



error:

	if (search) {
@@ -1442,7 +1442,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ies, 


	hif_drv->connect_timer_vif = vif;

	mod_timer(&hif_drv->connect_timer,

		  jiffies + msecs_to_jiffies(HOST_IF_CONNECT_TIMEOUT));

		  jiffies + msecs_to_jiffies(WILC_HIF_CONNECT_TIMEOUT_MS));



	return 0;

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static u8 curr_channel; 
static u8 p2p_oui[] = {0x50, 0x6f, 0x9A, 0x09};

static u8 p2p_vendor_spec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};



#define DURING_IP_TIME_OUT	15000

#define WILC_IP_TIMEOUT_MS		15000



static void clear_during_ip(struct timer_list *t)

{
@@ -1489,7 +1489,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
	case NL80211_IFTYPE_P2P_GO:

		vif->obtaining_ip = true;

		mod_timer(&vif->during_ip_timer,

			  jiffies + msecs_to_jiffies(DURING_IP_TIME_OUT));

			  jiffies + msecs_to_jiffies(WILC_IP_TIMEOUT_MS));

		wilc_set_operation_mode(vif, WILC_AP_MODE);

		dev->ieee80211_ptr->iftype = type;

		priv->wdev->iftype = type;

drivers/staging/wilc1000/wilc_wlan.c

+2 −2
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ int wilc_wlan_cfg_set(struct wilc_vif *vif, int start, u16 wid, u8 *buffer, 
		ret_size = 0;



	if (!wait_for_completion_timeout(&wilc->cfg_event,

					 msecs_to_jiffies(CFG_PKTS_TIMEOUT))) {

					 WILC_CFG_PKTS_TIMEOUT)) {

		netdev_dbg(vif->ndev, "%s: Timed Out\n", __func__);

		ret_size = 0;

	}
@@ -1179,7 +1179,7 @@ int wilc_wlan_cfg_get(struct wilc_vif *vif, int start, u16 wid, int commit, 
		ret_size = 0;



	if (!wait_for_completion_timeout(&wilc->cfg_event,

					 msecs_to_jiffies(CFG_PKTS_TIMEOUT))) {

					 WILC_CFG_PKTS_TIMEOUT)) {

		netdev_dbg(vif->ndev, "%s: Timed Out\n", __func__);

		ret_size = 0;

	}

drivers/staging/wilc1000/wilc_wlan.h

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 
#define ENABLE_RX_VMM		(SEL_VMM_TBL1 | EN_VMM)

#define ENABLE_TX_VMM		(SEL_VMM_TBL0 | EN_VMM)

/*time for expiring the completion of cfg packets*/

#define CFG_PKTS_TIMEOUT	2000

#define WILC_CFG_PKTS_TIMEOUT	msecs_to_jiffies(2000)



#define IS_MANAGMEMENT		0x100

#define IS_MANAGMEMENT_CALLBACK	0x080

CRA Git | Maintained and supported by SUSTech CRA and CCSE