[PATCH 4/4] Staging: rlt8192u: Remove spaces at the start of lines
From: Mike Dupuis
This is a patch to remove spaces at the start of lines in
ieee80211_softmac_wx.c.
Signed-off-by: Mike Dupuis
---
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
index 5f384b4..3e72d33 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
@@ -178,7 +178,7 @@ out:
}
EXPORT_SYMBOL(ieee80211_wx_set_wap);
- int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct
iw_request_info *a,union iwreq_data *wrqu,char *b)
+int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct
iw_request_info *a,union iwreq_data *wrqu,char *b)
{
int len, ret = 0;
unsigned long flags;
@@ -440,7 +440,7 @@ out:
}
EXPORT_SYMBOL(ieee80211_wx_set_essid);
- int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct
iw_request_info *a,
+int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct
iw_request_info *a,
union iwreq_data *wrqu, char *b)
{
@@ -449,7 +449,7 @@ EXPORT_SYMBOL(ieee80211_wx_set_essid);
}
EXPORT_SYMBOL(ieee80211_wx_get_mode);
- int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee,
+int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
@@ -589,7 +589,7 @@ int ieee80211_wx_get_power(struct ieee80211_device *ieee,
/* ieee->current_network.dtim_period *
ieee->current_network.beacon_interval * 1024; */
}
- if ((ieee->ps & (IEEE80211_PS_MBCAST | IEEE80211_PS_UNICAST)) ==
(IEEE80211_PS_MBCAST | IEEE80211_PS_UNICAST))
+ if ((ieee->ps & (IEEE80211_PS_MBCAST | IEEE80211_PS_UNICAST)) ==
(IEEE80211_PS_MBCAST | IEEE80211_PS_UNICAST))
wrqu->power.flags |= IW_POWER_ALL_R;
else if (ieee->ps & IEEE80211_PS_MBCAST)
wrqu->power.flags |= IW_POWER_MULTICAST_R;
--
2.1.4
---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/4] Staging: rtl8192u: suspect code indent for conditional statment
From: Mike Dupuis
This is a patch to correct an improperly indented block of code in
ieee80211_softmac_wx.c
Signed-off-by: Mike Dupuis
---
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
index be3f61a..aa1209f 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
@@ -72,9 +72,8 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee,
struct iw_request_info
if (ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode ==
IW_MODE_MASTER)
if (ieee->state == IEEE80211_LINKED) {
-
- ieee80211_stop_send_beacons(ieee);
- ieee80211_start_send_beacons(ieee);
+ ieee80211_stop_send_beacons(ieee);
+ ieee80211_start_send_beacons(ieee);
}
}
--
2.1.4
---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/4] Staging: rtl8192u: do not use C99 // comments
From: Mike Dupuis
This is a patch to convert C99-style comments to C89-style comments in
ieee80211_softmac_wx.c.
Signed-off-by: Mike Dupuis
---
.../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 28 +++---
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
index aa1209f..5f384b4 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
@@ -92,11 +92,11 @@ int ieee80211_wx_get_freq(struct ieee80211_device *ieee,
if (ieee->current_network.channel == 0)
return -1;
- //NM 0.7.0 will not accept channel any more.
+ /* NM 0.7.0 will not accept channel any more. */
fwrq->m = ieee80211_wlan_frequencies[ieee->current_network.channel-1] *
10;
fwrq->e = 1;
-// fwrq->m = ieee->current_network.channel;
-// fwrq->e = 0;
+ /* fwrq->m = ieee->current_network.channel; */
+ /* fwrq->e = 0; */
return 0;
}
@@ -140,7 +140,7 @@ int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
int ret = 0;
unsigned long flags;
- short ifup = ieee->proto_started;//dev->flags & IFF_UP;
+ short ifup = ieee->proto_started; /* dev->flags & IFF_UP; */
struct sockaddr *temp = (struct sockaddr *)awrq;
ieee->sync_scan_hurryup = 1;
@@ -222,7 +222,7 @@ int ieee80211_wx_set_rate(struct ieee80211_device *ieee,
u32 target_rate = wrqu->bitrate.value;
ieee->rate = target_rate/10;
- //FIXME: we might want to limit rate also in management protocols.
+ /* FIXME: we might want to limit rate also in management protocols. */
return 0;
}
EXPORT_SYMBOL(ieee80211_wx_set_rate);
@@ -343,7 +343,7 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
ieee->InitialGainHandler(ieee->dev, IG_Restore);
ieee->state = IEEE80211_LINKED;
ieee->link_change(ieee->dev);
- // To prevent the immediately calling watch_dog after scan.
+ /* To prevent the immediately calling watch_dog after scan. */
if
(ieee->LinkDetectInfo.NumRecvBcnInPeriod==0||ieee->LinkDetectInfo.NumRecvDataInPeriod==0)
{
ieee->LinkDetectInfo.NumRecvBcnInPeriod = 1;
@@ -419,7 +419,7 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee,
spin_lock_irqsave(&ieee->lock, flags);
if (wrqu->essid.flags && wrqu->essid.length) {
- //first flush current network.ssid
+ /* first flush current network.ssid */
len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ?
(wrqu->essid.length-1) : IW_ESSID_MAX_SIZE;
strncpy(ieee->current_network.ssid, extra, len+1);
ieee->current_network.ssid_len = len+1;
@@ -526,15 +526,15 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
goto exit;
}
if (wrqu->power.flags & IW_POWER_TIMEOUT) {
- //ieee->ps_period = wrqu->power.value / 1000;
+ /* ieee->ps_period = wrqu->power.value / 1000; */
ieee->ps_timeout = wrqu->power.value / 1000;
}
if (wrqu->power.flags & IW_POWER_PERIOD) {
- //ieee->ps_timeout = wrqu->power.value / 1000;
+ /* ieee->ps_timeout = wrqu->power.value / 1000; */
ieee->ps_period = wrqu->power.value / 1000;
- //wrq->value / 1024;
+ /* wrq->value / 1024; */
}
switch (wrqu->power.flags & IW_POWER_MODE) {
@@ -549,7 +549,7 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
break;
case IW_POWER_ON:
- // ieee->ps = IEEE80211_PS_DISABLED;
+ /* ieee->ps = IEEE80211_PS_DISABLED; */
break;
default:
@@ -582,11 +582,11 @@ int ieee80211_wx_get_power(struct ieee80211_device *ieee,
wrqu->power.flags = IW_POWER_TIMEOUT;
wrqu->power.value = ieee->ps_timeout * 1000;
} else {
-// ret = -EOPNOTSUPP;
-// goto exit;
+ /* ret = -EOPNOTSUPP; */
+ /* goto exit; */
wrqu->power.flags = IW_POWER_PERIOD;
wrqu->power.value = ieee->ps_period * 1000;
-//ieee->current_network.dtim_period * ieee->current_network.beacon_interval *
1024;
+ /* ieee->current_network.dtim_period *
ieee->current_network.beacon_interval * 1024; */
}
if ((ieee->ps & (IEEE80211_PS_MBCAST | IEEE80211_PS_UNICAST)) ==
(IEEE80211_PS_MBCAST | IEEE80211_PS_UNICAST))
--
2.1.4
---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/drive
[PATCH 1/4] Staging: rtl8192u: space required before open parentheses
From: Mike Dupuis
This is a patch to add spaces where required before open parentheses in
ieee80211_softmac_wx.c
Signed-off-by: Mike Dupuis
---
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
index 3662925..be3f61a 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
@@ -70,8 +70,8 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee,
struct iw_request_info
ieee->current_network.channel = fwrq->m;
ieee->set_chan(ieee->dev, ieee->current_network.channel);
- if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode ==
IW_MODE_MASTER)
- if(ieee->state == IEEE80211_LINKED) {
+ if (ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode ==
IW_MODE_MASTER)
+ if (ieee->state == IEEE80211_LINKED) {
ieee80211_stop_send_beacons(ieee);
ieee80211_start_send_beacons(ieee);
@@ -353,7 +353,7 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
if (ieee->data_hard_resume)
ieee->data_hard_resume(ieee->dev);
- if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
+ if (ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
ieee80211_start_send_beacons(ieee);
netif_carrier_on(ieee->dev);
@@ -410,7 +410,7 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee,
goto out;
}
- if(proto_started)
+ if (proto_started)
ieee80211_stop_protocol(ieee);
@@ -461,7 +461,7 @@ EXPORT_SYMBOL(ieee80211_wx_get_mode);
down(&ieee->wx_sem);
- if(enable)
+ if (enable)
ieee->raw_tx = 1;
else
ieee->raw_tx = 0;
@@ -478,7 +478,7 @@ EXPORT_SYMBOL(ieee80211_wx_get_mode);
netif_carrier_on(ieee->dev);
}
- if(prev && ieee->raw_tx == 1)
+ if (prev && ieee->raw_tx == 1)
netif_carrier_off(ieee->dev);
}
--
2.1.4
---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/4] Staging: rtl8192u: fix checkpatch.pl issues
From: Mike Dupuis This is a series of patches to fix several checkpatch.pl issues in ieee80211_softmac_wx.c. Signed-off-by: Mike Dupuis Checkpatch.pl output before: total: 34 errors, 29 warnings, 605 lines checked Checkpatch.pl output after: total: 14 errors, 24 warnings, 604 lines checked mike dupuis (4): Staging: rtl8192u: space required before open parentheses Staging: rtl8192u: suspect code indent for conditional statment Staging: rtl8192u: do not use C99 // comments Staging: rlt8192u: Remove spaces at the start of lines .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 53 +++--- 1 file changed, 26 insertions(+), 27 deletions(-) -- 2.1.4 --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: wilc1000: Use NULL instead of zero
This patch fixes the warning generated by sparse
"Using plain integer as NULL pointer" by using NULL
instead of zero.
Signed-off-by: Ronit halder
---
drivers/staging/wilc1000/coreconfigurator.c | 14 +++---
drivers/staging/wilc1000/linux_wlan.c | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c
b/drivers/staging/wilc1000/coreconfigurator.c
index 544c12d..8164a33 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -525,7 +525,7 @@ u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16
u16TagParamOffset)
u16index += (IE_HDR_LEN + pu8msa[u16index + 1]);
}
- return 0;
+ return NULL;
}
/* This function gets the current channel information from
@@ -587,7 +587,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo
**ppstrNetworkInfo)
u16 u16WidID = (u16)WID_NIL;
u16 u16WidLen = 0;
- u8 *pu8WidVal = 0;
+ u8 *pu8WidVal = NULL;
u8MsgType = pu8MsgBuffer[0];
@@ -614,10 +614,10 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo
**ppstrNetworkInfo)
/* parse the WID value of the WID "WID_NEWORK_INFO" */
{
- u8 *pu8msa = 0;
+ u8 *pu8msa = NULL;
u16 u16RxLen = 0;
- u8 *pu8TimElm = 0;
- u8 *pu8IEs = 0;
+ u8 *pu8TimElm = NULL;
+ u8 *pu8IEs = NULL;
u16 u16IEsLen = 0;
u8 u8index = 0;
u32 u32Tsf_Lo;
@@ -670,7 +670,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo
**ppstrNetworkInfo)
/* Get DTIM Period */
pu8TimElm = get_tim_elm(pu8msa, (u16RxLen + FCS_LEN), u8index);
- if (pu8TimElm != 0)
+ if (pu8TimElm != NULL)
pstrNetworkInfo->u8DtimPeriod = pu8TimElm[3];
pu8IEs = &pu8msa[MAC_HDR_LEN + TIME_STAMP_LEN +
BEACON_INTERVAL_LEN + CAP_INFO_LEN];
u16IEsLen = u16RxLen - (MAC_HDR_LEN + TIME_STAMP_LEN +
BEACON_INTERVAL_LEN + CAP_INFO_LEN);
@@ -743,7 +743,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
s32 s32Error = WILC_SUCCESS;
tstrConnectRespInfo *pstrConnectRespInfo = NULL;
u16 u16AssocRespLen = 0;
- u8 *pu8IEs = 0;
+ u8 *pu8IEs = NULL;
u16 u16IEsLen = 0;
pstrConnectRespInfo = kmalloc(sizeof(tstrConnectRespInfo), GFP_KERNEL);
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 63f44f8..d8f17c6 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -412,7 +412,7 @@ static int isr_bh_routine(void *vp)
break;
}
PRINT_D(INT_DBG, "Interrupt received BH\n");
- if (g_linux_wlan->oup.wlan_handle_rx_isr != 0)
+ if (g_linux_wlan->oup.wlan_handle_rx_isr != NULL)
g_linux_wlan->oup.wlan_handle_rx_isr();
else
PRINT_ER("wlan_handle_rx_isr() hasn't been
initialized\n");
@@ -1284,7 +1284,7 @@ int wlan_initialize_threads(perInterface_wlan_t *nic)
#elif (RX_BH_TYPE == RX_BH_KTHREAD)
PRINT_D(INIT_DBG, "Creating kthread for Rxq BH\n");
g_linux_wlan->rx_bh_thread = kthread_run(isr_bh_routine, (void
*)g_linux_wlan, "K_RXQ_BH");
- if (g_linux_wlan->rx_bh_thread == 0) {
+ if (g_linux_wlan->rx_bh_thread == NULL) {
PRINT_ER("couldn't create RX BH thread\n");
ret = -ENOBUFS;
goto _fail_;
@@ -1309,7 +1309,7 @@ int wlan_initialize_threads(perInterface_wlan_t *nic)
/* create tx task */
PRINT_D(INIT_DBG, "Creating kthread for transmission\n");
g_linux_wlan->txq_thread = kthread_run(linux_wlan_txq_task, (void
*)g_linux_wlan, "K_TXQ_TASK");
- if (g_linux_wlan->txq_thread == 0) {
+ if (g_linux_wlan->txq_thread == NULL) {
PRINT_ER("couldn't create TXQ thread\n");
ret = -ENOBUFS;
goto _fail_2;
--
2.4.0.GIT
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging:comedi: Fix typo in staging/comedi
On Sun, Sep 13, 2015 at 11:29:32PM +0900, Masanari Iida wrote: > This patch fix spelling typo found in staging/comedi. > > Signed-off-by: Masanari Iida This doesn't apply, please rebase it against my staging-next or staging-testing branch of staging.git on kernel.org and resend. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: dgnc: Fixed line over 80 characters long
On Sun, Sep 13, 2015 at 04:22:00PM +0530, Anjali Menon wrote: > This is a patch that fixes line over 80 characters coding style > warning detected by checkpatch.pl. > > WARNING: line over 80 characters > > Signed-off-by: Anjali Menon > --- > drivers/staging/dgnc/dgnc_mgmt.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/dgnc/dgnc_mgmt.c > b/drivers/staging/dgnc/dgnc_mgmt.c > index b13318a..81c793a 100644 > --- a/drivers/staging/dgnc/dgnc_mgmt.c > +++ b/drivers/staging/dgnc/dgnc_mgmt.c > @@ -148,7 +148,8 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, > unsigned long arg) > di.info_bdstate = dgnc_Board[brd]->dpastatus; > di.info_ioport = 0; > di.info_physaddr = (ulong) dgnc_Board[brd]->membase; > - di.info_physsize = (ulong) dgnc_Board[brd]->membase - > dgnc_Board[brd]->membase_end; > + di.info_physsize = (ulong) dgnc_Board[brd]->membase > + - dgnc_Board[brd]->membase_end; This looks worse than it did before, there's better ways to make this line shorter. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3][RESEND] staging/rtl8188eu : Remove duplicated BIT() definitions
The BIT() macro is already defined in bitops.h, remove duplicate
definitions. Users of BIT() macro are expecting unsigned int/u32, so
add typecasts where this creates a build warning.
Signed-off-by: Anish Bhatt
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 7 +--
drivers/staging/rtl8188eu/core/rtw_wlan_util.c| 6 --
drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4
drivers/staging/rtl8188eu/include/wifi.h | 7 ---
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 5dae7de..dd82018 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4177,10 +4177,13 @@ void mgt_dispatcher(struct adapter *padapter, struct
recv_frame *precv_frame)
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
("+mgt_dispatcher: type(0x%x) subtype(0x%x)\n",
- GetFrameType(pframe), GetFrameSubType(pframe)));
+ (unsigned int)GetFrameType(pframe),
+ (unsigned int)GetFrameSubType(pframe)));
if (GetFrameType(pframe) != WIFI_MGT_TYPE) {
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("mgt_dispatcher:
type(0x%x) error!\n", GetFrameType(pframe)));
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
+("mgt_dispatcher: type(0x%x) error!\n",
+ (unsigned int)GetFrameType(pframe)));
return;
}
diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index 077b39a..3bb40a7fe 100644
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -1414,13 +1414,15 @@ void update_IOT_info(struct adapter *padapter)
pmlmeinfo->turboMode_cts2self = 0;
pmlmeinfo->turboMode_rtsen = 1;
/* disable high power */
- Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), false);
+ Switch_DM_Func(padapter, (u32)(~DYNAMIC_BB_DYNAMIC_TXPWR),
+ false);
break;
case HT_IOT_PEER_REALTEK:
/* rtw_write16(padapter, 0x4cc, 0x); */
/* rtw_write16(padapter, 0x546, 0x01c0); */
/* disable high power */
- Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), false);
+ Switch_DM_Func(padapter, (u32)(~DYNAMIC_BB_DYNAMIC_TXPWR),
+ false);
break;
default:
pmlmeinfo->turboMode_cts2self = 0;
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_spec.h
b/drivers/staging/rtl8188eu/include/rtl8188e_spec.h
index 2c33eb3..e99179a 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_spec.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_spec.h
@@ -19,10 +19,6 @@
#ifndef __RTL8188E_SPEC_H__
#define __RTL8188E_SPEC_H__
-#ifndef BIT
-#define BIT(x) (1 << (x))
-#endif
-
#define BIT0 0x0001
#define BIT1 0x0002
#define BIT2 0x0004
diff --git a/drivers/staging/rtl8188eu/include/wifi.h
b/drivers/staging/rtl8188eu/include/wifi.h
index 6e5fa73..6cb5bec 100644
--- a/drivers/staging/rtl8188eu/include/wifi.h
+++ b/drivers/staging/rtl8188eu/include/wifi.h
@@ -20,13 +20,6 @@
#ifndef _WIFI_H_
#define _WIFI_H_
-
-#ifdef BIT
-/* error "BIT define occurred earlier elsewhere!\n" */
-#undef BIT
-#endif
-#define BIT(x) (1 << (x))
-
#define WLAN_IEEE_OUI_LEN 3
#define WLAN_CRC_LEN 4
#define WLAN_BSSID_LEN 6
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3 3/4] staging/rtl8188eu : Remove duplicated BIT() definitions
On Sat, Sep 12, 2015 at 02:04:43AM -0700, Anish Bhatt wrote:
> On Fri, Sep 11, 2015 at 7:42 PM, Greg KH wrote:
> > On Wed, Sep 09, 2015 at 03:57:09PM -0700, Anish Bhatt wrote:
> >> The BIT() macro is already defined in bitops.h, remove duplicate
> >> definitions. Users of BIT() macro are expecting unsigned int/u32, so
> >> add typecasts where this creates a build warning.
> >>
> >> Signed-off-by: Anish Bhatt
> >> ---
> >> drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 7 +--
> >> drivers/staging/rtl8188eu/core/rtw_wlan_util.c| 6 --
> >> drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4
> >> drivers/staging/rtl8188eu/include/wifi.h | 7 ---
> >> 4 files changed, 9 insertions(+), 15 deletions(-)
> >>
> >> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> >> b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> >> index 5dae7de..dd82018 100644
> >> --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> >> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> >> @@ -4177,10 +4177,13 @@ void mgt_dispatcher(struct adapter *padapter,
> >> struct recv_frame *precv_frame)
> >>
> >> RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
> >>("+mgt_dispatcher: type(0x%x) subtype(0x%x)\n",
> >> - GetFrameType(pframe), GetFrameSubType(pframe)));
> >> + (unsigned int)GetFrameType(pframe),
> >> + (unsigned int)GetFrameSubType(pframe)));
> >
> > I don't understand why you are adding these typecasts, you aren't
> > changing anything that requires this, right?
>
> BIT() is defined in bitops as (1UL << x). This causes compiler warnings with
> the %x format specifier used in the RT_TRACE messages, where previously
> rtl8188eu simply had (1 << x), hence the typecasts.
Ok, that makes sense. Can you please resend this, it's now out of my
queue.
thanks,
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH V3 29/31] staging: wilc1000: rename WILC_WFI_frame_register
On Mon, Sep 14, 2015 at 12:24:29PM +0900, Chaehyun Lim wrote: > This patch replaces WILC_WFI_frame_register with mgmt_frame_register to > avoid CamelCase. > > Signed-off-by: Chaehyun Lim > --- > V3: remove "wilc_" prefix > > drivers/staging/wilc1000/linux_wlan.c | 12 ++-- > drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +- > 2 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/staging/wilc1000/linux_wlan.c > b/drivers/staging/wilc1000/linux_wlan.c > index 63f44f8..5576e1c 100644 > --- a/drivers/staging/wilc1000/linux_wlan.c > +++ b/drivers/staging/wilc1000/linux_wlan.c > @@ -1618,8 +1618,8 @@ int mac_init_fn(struct net_device *ndev) > return 0; > } > > -voidWILC_WFI_frame_register(struct wiphy *wiphy, struct net_device *dev, > - u16 frame_type, bool reg); > +void mgmt_frame_register(struct wiphy *wiphy, struct net_device *dev, > + u16 frame_type, bool reg); This should be in a .h file, as it's a global variable. And because it's global, it needs to keep a wilc_ prefix, right? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: Added a new line
On Sun, Sep 13, 2015 at 04:31:33PM +0530, Aparna Karuthodi wrote:
> Added a new line after declaration to remove a coding style warning
> detected by checkpatch. The warning is given below
> WARNING: Missing a blank line after declarations
>
> Signed-off-by: Aparna Karuthodi
> ---
> drivers/staging/wilc1000/coreconfigurator.c |1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/staging/wilc1000/coreconfigurator.c
> b/drivers/staging/wilc1000/coreconfigurator.c
> index ed6ac45..0c964c6 100644
> --- a/drivers/staging/wilc1000/coreconfigurator.c
> +++ b/drivers/staging/wilc1000/coreconfigurator.c
> @@ -2101,6 +2101,7 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
> u32 u32WIDsCount, bool bRespRequired, u32 drvHandler)
> {
> s32 counter = 0, ret = 0;
> +
> if (gpstrWlanOps == NULL) {
> PRINT_D(CORECONFIG_DBG, "Net Dev is still not initialized\n");
> return 1;
someone already sent in this change before you did, sorry.
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: drivers: staging: wilc1000 - NULL pointer dereference
On Sun, Sep 13, 2015 at 06:17:26PM +0530, Chandra Gorentla wrote:
> Hi,
>
> At this point I do not have the hardware.
>
> NULL pointer deference is observed in the wilc1000.ko module on x86 target
> with bus type SPI and when SPI is not ready. Following are the steps to
> reproduce.
>
> $ sudo insmod drivers/staging/wilc1000/wilc1000.ko
> $ sudo ifconfig wlan1 up
>
> wlan1 in the above command is the device controlled by 'wilc1000.ko'.
>
> Though the target I tested is not built to support WILC1000, my test
> scenario can be treated as a case where in SPI is not working or WILC1000
> is not connected to the supported hardware.
>
> I think I know a fix (pasted below) to this but cannot test it because
> hardware
> is not available to test positive cases.
>
> Thanks,
> chandra
>
> gcs@gcs-HP-Compaq-nx6320:~/linux/staging$ git diff
> diff --git a/drivers/staging/wilc1000/linux_wlan.c
> b/drivers/staging/wilc1000/linux_wlan.c
> index 63f44f8..48f063d 100644
> --- a/drivers/staging/wilc1000/linux_wlan.c
> +++ b/drivers/staging/wilc1000/linux_wlan.c
> @@ -1634,6 +1634,12 @@ int mac_open(struct net_device *ndev)
> int i = 0;
> struct WILC_WFI_priv *priv;
>
> +#ifdef WILC_SPI
> + if (!g_linux_wlan || !g_linux_wlan->wilc_spidev) {
> + netdev_err(ndev, "wilc1000: SPI device not ready\n");
> + return -ENODEV;
> + }
> +#endif
> nic = netdev_priv(ndev);
> priv = wiphy_priv(nic->wilc_netdev->ieee80211_ptr->wiphy);
> PRINT_D(INIT_DBG, "MAC OPEN[%p]\n", ndev);
> gcs@gcs-HP-Compaq-nx6320:~/linux/staging$
>
Can you resend this in a format that I can apply it?
thanks,
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 1/2] staging: wilc1000: remove unused enum
On 2015년 09월 14일 13:25, Greg KH wrote: On Mon, Sep 14, 2015 at 10:29:26AM +0900, Tony Cho wrote: On 2015년 09월 12일 11:35, Greg KH wrote: On Fri, Sep 11, 2015 at 12:04:19PM +0900, Tony Cho wrote: From: Glen Lee This patch removes a unused enum tenuFrameClass. Signed-off-by: Glen Lee Signed-off-by: Tony Cho --- drivers/staging/wilc1000/coreconfigurator.c | 8 1 file changed, 8 deletions(-) I already applied this, why resend it? greg k-h This is one of series for the "[PATCH v2 2/2] staging: wilc1000: coreconfigurator.c: remove unused function". That's why it was sent to you. But you sent it as a part of a different series, why do that? When you do a v2 patch, please be specific, resend the whole series. Otherwise how am I supposed to know what to do? Remember, I get hundreds of patches to review and handle every day, you need to be very obvious as to what I need to do otherwise I will get it wrong :) greg k-h Understood. I will keep it in my mind to be more obvious. Thanks, Tony. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 1/2] staging: wilc1000: remove unused enum
On Mon, Sep 14, 2015 at 10:29:26AM +0900, Tony Cho wrote: > > > On 2015년 09월 12일 11:35, Greg KH wrote: > >On Fri, Sep 11, 2015 at 12:04:19PM +0900, Tony Cho wrote: > >>From: Glen Lee > >> > >>This patch removes a unused enum tenuFrameClass. > >> > >>Signed-off-by: Glen Lee > >>Signed-off-by: Tony Cho > >>--- > >> drivers/staging/wilc1000/coreconfigurator.c | 8 > >> 1 file changed, 8 deletions(-) > >I already applied this, why resend it? > > > >greg k-h > > This is one of series for the "[PATCH v2 2/2] staging: wilc1000: > coreconfigurator.c: remove unused function". > That's why it was sent to you. But you sent it as a part of a different series, why do that? When you do a v2 patch, please be specific, resend the whole series. Otherwise how am I supposed to know what to do? Remember, I get hundreds of patches to review and handle every day, you need to be very obvious as to what I need to do otherwise I will get it wrong :) greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 18/31] staging: wilc1000: rename WILC_WFI_get_station
This patch replaces WILC_WFI_get_station with get_station to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index d5365de..c15bd7c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1619,7 +1619,7 @@ static int WILC_WFI_dump_survey(struct wiphy *wiphy,
struct net_device *netdev,
/**
- * @brief WILC_WFI_get_station
+ * @brief get_station
* @detailsGet station information for the station identified by @mac
* @param[in] NONE
* @return int : Return 0 on Success.
@@ -1628,8 +1628,8 @@ static int WILC_WFI_dump_survey(struct wiphy *wiphy,
struct net_device *netdev,
* @version 1.0
*/
-static int WILC_WFI_get_station(struct wiphy *wiphy, struct net_device *dev,
- const u8 *mac, struct station_info *sinfo)
+static int get_station(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *mac, struct station_info *sinfo)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3578,7 +3578,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.del_station = del_station,
.change_station = change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
- .get_station = WILC_WFI_get_station,
+ .get_station = get_station,
.dump_station = WILC_WFI_dump_station,
.change_bss = WILC_WFI_change_bss,
.set_wiphy_params = WILC_WFI_set_wiphy_params,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 17/31] staging: wilc1000: rename WILC_WFI_change_station
This patch replaces WILC_WFI_change_station with change_station to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 5bdd111..d5365de 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3427,7 +3427,7 @@ static int del_station(struct wiphy *wiphy, struct
net_device *dev,
}
/**
- * @brief WILC_WFI_change_station
+ * @brief change_station
* @detailsModify a given station.
* @param[in]
* @return int : Return 0 on Success.
@@ -3435,8 +3435,8 @@ static int del_station(struct wiphy *wiphy, struct
net_device *dev,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_change_station(struct wiphy *wiphy, struct net_device *dev,
- const u8 *mac, struct station_parameters
*params)
+static int change_station(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *mac, struct station_parameters *params)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3576,7 +3576,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.stop_ap = stop_ap,
.add_station = add_station,
.del_station = del_station,
- .change_station = WILC_WFI_change_station,
+ .change_station = change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
.get_station = WILC_WFI_get_station,
.dump_station = WILC_WFI_dump_station,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 31/31] staging: wilc1000: rename WILC_WFI_set_cqm_rssi_config
This patch replaces WILC_WFI_set_cqm_rssi_config with
set_cqm_rssi_config to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index fd64303..a75f14a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2741,7 +2741,7 @@ void mgmt_frame_register(struct wiphy *wiphy,
#endif /*WILC_P2P*/
/**
- * @brief WILC_WFI_set_cqm_rssi_config
+ * @brief set_cqm_rssi_config
* @detailsConfigure connection quality monitor RSSI threshold.
* @param[in] struct wiphy *wiphy:
* @param[in] struct net_device *dev:
@@ -2752,8 +2752,8 @@ void mgmt_frame_register(struct wiphy *wiphy,
* @date 01 MAR 2012
* @version 1.0
*/
-static intWILC_WFI_set_cqm_rssi_config(struct wiphy *wiphy,
- struct net_device *dev, s32
rssi_thold, u32 rssi_hyst)
+static int set_cqm_rssi_config(struct wiphy *wiphy,
+ struct net_device *dev, s32 rssi_thold, u32
rssi_hyst)
{
PRINT_D(CFG80211_DBG, "Setting CQM RSSi Function\n");
return 0;
@@ -3593,7 +3593,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.mgmt_tx = mgmt_tx,
.mgmt_frame_register = mgmt_frame_register,
.set_power_mgmt = set_power_mgmt,
- .set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
+ .set_cqm_rssi_config = set_cqm_rssi_config,
#endif
};
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 27/31] staging: wilc1000: rename WILC_WFI_mgmt_tx_cancel_wait
This patch replaces WILC_WFI_mgmt_tx_cancel_wait with
mgmt_tx_cancel_wait to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c7ac967..627a254 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2652,9 +2652,9 @@ int WILC_WFI_mgmt_tx(struct wiphy *wiphy,
return s32Error;
}
-int WILC_WFI_mgmt_tx_cancel_wait(struct wiphy *wiphy,
- struct wireless_dev *wdev,
- u64 cookie)
+int mgmt_tx_cancel_wait(struct wiphy *wiphy,
+ struct wireless_dev *wdev,
+ u64 cookie)
{
struct WILC_WFI_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv;
@@ -3589,7 +3589,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
#ifdef WILC_P2P
.remain_on_channel = remain_on_channel,
.cancel_remain_on_channel = cancel_remain_on_channel,
- .mgmt_tx_cancel_wait = WILC_WFI_mgmt_tx_cancel_wait,
+ .mgmt_tx_cancel_wait = mgmt_tx_cancel_wait,
.mgmt_tx = WILC_WFI_mgmt_tx,
.mgmt_frame_register = WILC_WFI_frame_register,
.set_power_mgmt = WILC_WFI_set_power_mgmt,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 26/31] staging: wilc1000: rename WILC_WFI_cancel_remain_on_channel
This patch replaces WILC_WFI_cancel_remain_on_channel with
cancel_remain_on_channel to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 40bf7a5..c7ac967 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2444,7 +2444,7 @@ static int remain_on_channel(struct wiphy *wiphy,
}
/**
- * @brief WILC_WFI_cancel_remain_on_channel
+ * @brief cancel_remain_on_channel
* @detailsCancel an on-going remain-on-channel operation.
* This allows the operation to be terminated prior to
timeout based on
* the duration value.
@@ -2456,9 +2456,9 @@ static int remain_on_channel(struct wiphy *wiphy,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_cancel_remain_on_channel(struct wiphy *wiphy,
- struct wireless_dev *wdev,
- u64 cookie)
+static int cancel_remain_on_channel(struct wiphy *wiphy,
+ struct wireless_dev *wdev,
+ u64 cookie)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3588,7 +3588,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.flush_pmksa = flush_pmksa,
#ifdef WILC_P2P
.remain_on_channel = remain_on_channel,
- .cancel_remain_on_channel = WILC_WFI_cancel_remain_on_channel,
+ .cancel_remain_on_channel = cancel_remain_on_channel,
.mgmt_tx_cancel_wait = WILC_WFI_mgmt_tx_cancel_wait,
.mgmt_tx = WILC_WFI_mgmt_tx,
.mgmt_frame_register = WILC_WFI_frame_register,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 30/31] staging: wilc1000: rename WILC_WFI_set_power_mgmt
This patch replaces WILC_WFI_set_power_mgmt with set_power_mgmt to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index f2ffef8..fd64303 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2794,7 +2794,7 @@ static int dump_station(struct wiphy *wiphy, struct
net_device *dev,
/**
- * @brief WILC_WFI_set_power_mgmt
+ * @brief set_power_mgmt
* @details
* @param[in]
* @return int : Return 0 on Success.
@@ -2802,8 +2802,8 @@ static int dump_station(struct wiphy *wiphy, struct
net_device *dev,
* @date 01 JUL 2012
* @version
1.0WILC_WFI_set_cqmWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_config_rssi_config
*/
-int WILC_WFI_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
- bool enabled, int timeout)
+int set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
+ bool enabled, int timeout)
{
struct WILC_WFI_priv *priv;
@@ -3592,7 +3592,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.mgmt_tx_cancel_wait = mgmt_tx_cancel_wait,
.mgmt_tx = mgmt_tx,
.mgmt_frame_register = mgmt_frame_register,
- .set_power_mgmt = WILC_WFI_set_power_mgmt,
+ .set_power_mgmt = set_power_mgmt,
.set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
#endif
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 22/31] staging: wilc1000: rename WILC_WFI_set_pmksa
This patch replaces WILC_WFI_set_pmksa with set_pmksa to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 51ed89a..774897f 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1880,7 +1880,7 @@ static int WILC_WFI_set_bitrate_mask(struct wiphy *wiphy,
}
/**
- * @brief WILC_WFI_set_pmksa
+ * @brief set_pmksa
* @detailsCache a PMKID for a BSSID. This is mostly useful for fullmac
* devices running firmwares capable of generating the
(re) association
* RSN IE. It allows for faster roaming between WPA2
BSSIDs.
@@ -1890,8 +1890,8 @@ static int WILC_WFI_set_bitrate_mask(struct wiphy *wiphy,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
- struct cfg80211_pmksa *pmksa)
+static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
+struct cfg80211_pmksa *pmksa)
{
u32 i;
s32 s32Error = WILC_SUCCESS;
@@ -3583,7 +3583,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.change_bss = change_bss,
.set_wiphy_params = set_wiphy_params,
- .set_pmksa = WILC_WFI_set_pmksa,
+ .set_pmksa = set_pmksa,
.del_pmksa = WILC_WFI_del_pmksa,
.flush_pmksa = WILC_WFI_flush_pmksa,
#ifdef WILC_P2P
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 21/31] staging: wilc1000: rename WILC_WFI_set_wiphy_params
This patch replaces WILC_WFI_set_wiphy_params with set_wiphy_params to
avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e1514db..51ed89a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1802,7 +1802,7 @@ static int WILC_WFI_disassoc(struct wiphy *wiphy, struct
net_device *dev,
}
/**
- * @brief WILC_WFI_set_wiphy_params
+ * @brief set_wiphy_params
* @detailsNotify that wiphy parameters have changed;
* @param[in] Changed bitfield (see &enum wiphy_params_flags) describes
which values
* have changed.
@@ -1811,7 +1811,7 @@ static int WILC_WFI_disassoc(struct wiphy *wiphy, struct
net_device *dev,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_set_wiphy_params(struct wiphy *wiphy, u32 changed)
+static int set_wiphy_params(struct wiphy *wiphy, u32 changed)
{
s32 s32Error = WILC_SUCCESS;
tstrCfgParamVal pstrCfgParamVal;
@@ -3581,7 +3581,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.get_station = get_station,
.dump_station = dump_station,
.change_bss = change_bss,
- .set_wiphy_params = WILC_WFI_set_wiphy_params,
+ .set_wiphy_params = set_wiphy_params,
.set_pmksa = WILC_WFI_set_pmksa,
.del_pmksa = WILC_WFI_del_pmksa,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 28/31] staging: wilc1000: rename WILC_WFI_mgmt_tx
This patch replaces WILC_WFI_mgmt_tx with mgmt_tx to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 627a254..068e648 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2496,10 +2496,10 @@ void WILC_WFI_add_wilcvendorspec(u8 *buff)
*/
extern linux_wlan_t *g_linux_wlan;
extern bool bEnablePS;
-int WILC_WFI_mgmt_tx(struct wiphy *wiphy,
- struct wireless_dev *wdev,
- struct cfg80211_mgmt_tx_params *params,
- u64 *cookie)
+int mgmt_tx(struct wiphy *wiphy,
+ struct wireless_dev *wdev,
+ struct cfg80211_mgmt_tx_params *params,
+ u64 *cookie)
{
struct ieee80211_channel *chan = params->chan;
unsigned int wait = params->wait;
@@ -3590,7 +3590,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.remain_on_channel = remain_on_channel,
.cancel_remain_on_channel = cancel_remain_on_channel,
.mgmt_tx_cancel_wait = mgmt_tx_cancel_wait,
- .mgmt_tx = WILC_WFI_mgmt_tx,
+ .mgmt_tx = mgmt_tx,
.mgmt_frame_register = WILC_WFI_frame_register,
.set_power_mgmt = WILC_WFI_set_power_mgmt,
.set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 29/31] staging: wilc1000: rename WILC_WFI_frame_register
This patch replaces WILC_WFI_frame_register with mgmt_frame_register to
avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/linux_wlan.c | 12 ++--
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 63f44f8..5576e1c 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1618,8 +1618,8 @@ int mac_init_fn(struct net_device *ndev)
return 0;
}
-voidWILC_WFI_frame_register(struct wiphy *wiphy, struct net_device *dev,
- u16 frame_type, bool reg);
+void mgmt_frame_register(struct wiphy *wiphy, struct net_device *dev,
+u16 frame_type, bool reg);
/* This fn is called, when this device is setup using ifconfig */
int mac_open(struct net_device *ndev)
@@ -1677,10 +1677,10 @@ int mac_open(struct net_device *ndev)
goto _err_;
}
- WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy,
nic->wilc_netdev,
- nic->g_struct_frame_reg[0].frame_type,
nic->g_struct_frame_reg[0].reg);
- WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy,
nic->wilc_netdev,
- nic->g_struct_frame_reg[1].frame_type,
nic->g_struct_frame_reg[1].reg);
+ mgmt_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy,
nic->wilc_netdev,
+ nic->g_struct_frame_reg[0].frame_type,
nic->g_struct_frame_reg[0].reg);
+ mgmt_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy,
nic->wilc_netdev,
+ nic->g_struct_frame_reg[1].frame_type,
nic->g_struct_frame_reg[1].reg);
netif_wake_queue(ndev);
g_linux_wlan->open_ifcs++;
nic->mac_opened = 1;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 068e648..f2ffef8 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2679,7 +2679,7 @@ int mgmt_tx_cancel_wait(struct wiphy *wiphy,
}
/**
- * @brief WILC_WFI_frame_register
+ * @brief mgmt_frame_register
* @details Notify driver that a management frame type was
* registered. Note that this callback may not sleep, and cannot
run
* concurrently with itself.
@@ -2689,9 +2689,9 @@ int mgmt_tx_cancel_wait(struct wiphy *wiphy,
* @date 01 JUL 2012
* @version
*/
-voidWILC_WFI_frame_register(struct wiphy *wiphy,
- struct wireless_dev *wdev,
- u16 frame_type, bool reg)
+void mgmt_frame_register(struct wiphy *wiphy,
+struct wireless_dev *wdev,
+u16 frame_type, bool reg)
{
struct WILC_WFI_priv *priv;
@@ -3591,7 +3591,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.cancel_remain_on_channel = cancel_remain_on_channel,
.mgmt_tx_cancel_wait = mgmt_tx_cancel_wait,
.mgmt_tx = mgmt_tx,
- .mgmt_frame_register = WILC_WFI_frame_register,
+ .mgmt_frame_register = mgmt_frame_register,
.set_power_mgmt = WILC_WFI_set_power_mgmt,
.set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
#endif
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 23/31] staging: wilc1000: rename WILC_WFI_del_pmksa
This patch replaces WILC_WFI_del_pmksa with del_pmksa to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 774897f..93d0c2a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1932,7 +1932,7 @@ static int set_pmksa(struct wiphy *wiphy, struct
net_device *netdev,
}
/**
- * @brief WILC_WFI_del_pmksa
+ * @brief del_pmksa
* @detailsDelete a cached PMKID.
* @param[in]
* @return int : Return 0 on Success
@@ -1940,8 +1940,8 @@ static int set_pmksa(struct wiphy *wiphy, struct
net_device *netdev,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
- struct cfg80211_pmksa *pmksa)
+static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
+struct cfg80211_pmksa *pmksa)
{
u32 i;
@@ -3584,7 +3584,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.set_wiphy_params = set_wiphy_params,
.set_pmksa = set_pmksa,
- .del_pmksa = WILC_WFI_del_pmksa,
+ .del_pmksa = del_pmksa,
.flush_pmksa = WILC_WFI_flush_pmksa,
#ifdef WILC_P2P
.remain_on_channel = WILC_WFI_remain_on_channel,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 19/31] staging: wilc1000: rename WILC_WFI_dump_station
This patch replaces WILC_WFI_dump_station with dump_station to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c15bd7c..e932e64 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2760,7 +2760,7 @@ static intWILC_WFI_set_cqm_rssi_config(struct wiphy
*wiphy,
}
/**
- * @brief WILC_WFI_dump_station
+ * @brief dump_station
* @detailsConfigure connection quality monitor RSSI threshold.
* @param[in] struct wiphy *wiphy:
* @param[in] struct net_device *dev
@@ -2772,8 +2772,8 @@ static intWILC_WFI_set_cqm_rssi_config(struct wiphy
*wiphy,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_dump_station(struct wiphy *wiphy, struct net_device *dev,
-int idx, u8 *mac, struct station_info *sinfo)
+static int dump_station(struct wiphy *wiphy, struct net_device *dev,
+ int idx, u8 *mac, struct station_info *sinfo)
{
struct WILC_WFI_priv *priv;
@@ -3579,7 +3579,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.change_station = change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
.get_station = get_station,
- .dump_station = WILC_WFI_dump_station,
+ .dump_station = dump_station,
.change_bss = WILC_WFI_change_bss,
.set_wiphy_params = WILC_WFI_set_wiphy_params,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 16/31] staging: wilc1000: rename WILC_WFI_del_station
This patch replaces WILC_WFI_del_station with del_station to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 72bcdc9..5bdd111 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3384,7 +3384,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
}
/**
- * @brief WILC_WFI_del_station
+ * @brief del_station
* @detailsRemove a station; @mac may be NULL to remove all stations.
* @param[in]
* @return int : Return 0 on Success.
@@ -3392,8 +3392,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_del_station(struct wiphy *wiphy, struct net_device *dev,
- struct station_del_parameters *params)
+static int del_station(struct wiphy *wiphy, struct net_device *dev,
+ struct station_del_parameters *params)
{
const u8 *mac = params->mac;
s32 s32Error = WILC_SUCCESS;
@@ -3575,7 +3575,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.change_beacon = change_beacon,
.stop_ap = stop_ap,
.add_station = add_station,
- .del_station = WILC_WFI_del_station,
+ .del_station = del_station,
.change_station = WILC_WFI_change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
.get_station = WILC_WFI_get_station,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 20/31] staging: wilc1000: rename WILC_WFI_change_bss
This patch replaces WILC_WFI_change_bss with change_bss to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e932e64..e1514db 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1710,7 +1710,7 @@ static int get_station(struct wiphy *wiphy, struct
net_device *dev,
/**
- * @brief WILC_WFI_change_bss
+ * @brief change_bss
* @detailsModify parameters for a given BSS.
* @param[in]
* -use_cts_prot: Whether to use CTS protection
@@ -1730,8 +1730,8 @@ static int get_station(struct wiphy *wiphy, struct
net_device *dev,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_change_bss(struct wiphy *wiphy, struct net_device *dev,
- struct bss_parameters *params)
+static int change_bss(struct wiphy *wiphy, struct net_device *dev,
+ struct bss_parameters *params)
{
PRINT_D(CFG80211_DBG, "Changing Bss parametrs\n");
return 0;
@@ -3580,7 +3580,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
#endif /* WILC_AP_EXTERNAL_MLME*/
.get_station = get_station,
.dump_station = dump_station,
- .change_bss = WILC_WFI_change_bss,
+ .change_bss = change_bss,
.set_wiphy_params = WILC_WFI_set_wiphy_params,
.set_pmksa = WILC_WFI_set_pmksa,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 25/31] staging: wilc1000: rename WILC_WFI_remain_on_channel
This patch replaces WILC_WFI_remain_on_channel with remain_on_channel
to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c425037..40bf7a5 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2391,7 +2391,7 @@ static void WILC_WFI_RemainOnChannelExpired(void
*pUserVoid, u32 u32SessionID)
/**
- * @brief WILC_WFI_remain_on_channel
+ * @brief remain_on_channel
* @detailsRequest the driver to remain awake on the specified
* channel for the specified duration to complete an
off-channel
* operation (e.g., public action frame exchange). When
the driver is
@@ -2403,10 +2403,10 @@ static void WILC_WFI_RemainOnChannelExpired(void
*pUserVoid, u32 u32SessionID)
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_remain_on_channel(struct wiphy *wiphy,
- struct wireless_dev *wdev,
- struct ieee80211_channel *chan,
- unsigned int duration, u64 *cookie)
+static int remain_on_channel(struct wiphy *wiphy,
+struct wireless_dev *wdev,
+struct ieee80211_channel *chan,
+unsigned int duration, u64 *cookie)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3587,7 +3587,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.del_pmksa = del_pmksa,
.flush_pmksa = flush_pmksa,
#ifdef WILC_P2P
- .remain_on_channel = WILC_WFI_remain_on_channel,
+ .remain_on_channel = remain_on_channel,
.cancel_remain_on_channel = WILC_WFI_cancel_remain_on_channel,
.mgmt_tx_cancel_wait = WILC_WFI_mgmt_tx_cancel_wait,
.mgmt_tx = WILC_WFI_mgmt_tx,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 24/31] staging: wilc1000: rename WILC_WFI_flush_pmksa
This patch replaces WILC_WFI_flush_pmksa with flush_pmksa to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 93d0c2a..c425037 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1981,7 +1981,7 @@ static int del_pmksa(struct wiphy *wiphy, struct
net_device *netdev,
}
/**
- * @brief WILC_WFI_flush_pmksa
+ * @brief flush_pmksa
* @detailsFlush all cached PMKIDs.
* @param[in]
* @return int : Return 0 on Success
@@ -1989,7 +1989,7 @@ static int del_pmksa(struct wiphy *wiphy, struct
net_device *netdev,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_flush_pmksa(struct wiphy *wiphy, struct net_device
*netdev)
+static int flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
{
struct WILC_WFI_priv *priv = wiphy_priv(wiphy);
@@ -3585,7 +3585,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.set_pmksa = set_pmksa,
.del_pmksa = del_pmksa,
- .flush_pmksa = WILC_WFI_flush_pmksa,
+ .flush_pmksa = flush_pmksa,
#ifdef WILC_P2P
.remain_on_channel = WILC_WFI_remain_on_channel,
.cancel_remain_on_channel = WILC_WFI_cancel_remain_on_channel,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 08/31] staging: wilc1000: rename WILC_WFI_set_default_key
This patch replaces WILC_WFI_set_default_key with set_default_key to
avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 5794db3..f0065cb 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1566,7 +1566,7 @@ static int get_key(struct wiphy *wiphy, struct net_device
*netdev, u8 key_index,
}
/**
- * @brief WILC_WFI_set_default_key
+ * @brief set_default_key
* @detailsSet the default management frame key on an interface
* @param[in]
* @return int : Return 0 on Success.
@@ -1574,8 +1574,8 @@ static int get_key(struct wiphy *wiphy, struct net_device
*netdev, u8 key_index,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_set_default_key(struct wiphy *wiphy, struct net_device
*netdev, u8 key_index,
- bool unicast, bool multicast)
+static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, u8
key_index,
+ bool unicast, bool multicast)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3565,7 +3565,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.add_key = add_key,
.del_key = del_key,
.get_key = get_key,
- .set_default_key = WILC_WFI_set_default_key,
+ .set_default_key = set_default_key,
#ifdef WILC_AP_EXTERNAL_MLME
.add_virtual_intf = WILC_WFI_add_virt_intf,
.del_virtual_intf = WILC_WFI_del_virt_intf,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 15/31] staging: wilc1000: rename WILC_WFI_add_station
This patch replaces WILC_WFI_add_station with add_station to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0b5baec..72bcdc9 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3313,7 +3313,7 @@ static int stop_ap(struct wiphy *wiphy, struct net_device
*dev)
}
/**
- * @brief WILC_WFI_add_station
+ * @brief add_station
* @detailsAdd a new station.
* @param[in]
* @return int : Return 0 on Success.
@@ -3321,8 +3321,8 @@ static int stop_ap(struct wiphy *wiphy, struct net_device
*dev)
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_add_station(struct wiphy *wiphy, struct net_device *dev,
-const u8 *mac, struct station_parameters
*params)
+static int add_station(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *mac, struct station_parameters *params)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3574,7 +3574,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.start_ap = start_ap,
.change_beacon = change_beacon,
.stop_ap = stop_ap,
- .add_station = WILC_WFI_add_station,
+ .add_station = add_station,
.del_station = WILC_WFI_del_station,
.change_station = WILC_WFI_change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 02/31] staging: wilc1000: rename WILC_WFI_CfgScan
This patch replaces WILC_WFI_CfgScan with scan to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c2060ff..2c39179 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -712,7 +712,7 @@ static int set_channel(struct wiphy *wiphy,
}
/**
- * @brief WILC_WFI_CfgScan
+ * @brief scan
* @detailsRequest to do a scan. If returning zero, the scan request is
given
* the driver, and will be valid until passed to
cfg80211_scan_done().
* For scan results, call cfg80211_inform_bss(); you can
call this outside
@@ -728,7 +728,7 @@ static int set_channel(struct wiphy *wiphy,
* kernel version 3.8.8 supported
* tony, sswd, WILC-KR, 2013-10-29
*/
-static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request
*request)
+static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
{
struct WILC_WFI_priv *priv;
u32 i;
@@ -3559,7 +3559,7 @@ int WILC_WFI_del_virt_intf(struct wiphy *wiphy, struct
wireless_dev *wdev)
static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.set_monitor_channel = set_channel,
- .scan = WILC_WFI_CfgScan,
+ .scan = scan,
.connect = WILC_WFI_CfgConnect,
.disconnect = WILC_WFI_disconnect,
.add_key = WILC_WFI_add_key,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 07/31] staging: wilc1000: rename WILC_WFI_get_key
This patch replaces WILC_WFI_get_key with get_key to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index dfa9db3..5794db3 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1511,7 +1511,7 @@ static int del_key(struct wiphy *wiphy, struct net_device
*netdev,
}
/**
- * @brief WILC_WFI_get_key
+ * @brief get_key
* @detailsGet information about the key with the given parameters.
* @mac_addr will be %NULL when requesting information
for a group
* key. All pointers given to the @callback function need
not be valid
@@ -1523,9 +1523,9 @@ static int del_key(struct wiphy *wiphy, struct net_device
*netdev,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8
key_index,
- bool pairwise,
- const u8 *mac_addr, void *cookie, void
(*callback)(void *cookie, struct key_params *))
+static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8
key_index,
+ bool pairwise,
+ const u8 *mac_addr, void *cookie, void (*callback)(void
*cookie, struct key_params *))
{
s32 s32Error = WILC_SUCCESS;
@@ -3564,7 +3564,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.disconnect = disconnect,
.add_key = add_key,
.del_key = del_key,
- .get_key = WILC_WFI_get_key,
+ .get_key = get_key,
.set_default_key = WILC_WFI_set_default_key,
#ifdef WILC_AP_EXTERNAL_MLME
.add_virtual_intf = WILC_WFI_add_virt_intf,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 09/31] staging: wilc1000: rename WILC_WFI_add_virt_intf
This patch replaces WILC_WFI_add_virt_intf with add_virtual_intf to
avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index f0065cb..5ff81cf 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3498,7 +3498,7 @@ static int WILC_WFI_change_station(struct wiphy *wiphy,
struct net_device *dev,
/**
- * @brief WILC_WFI_add_virt_intf
+ * @brief add_virtual_intf
* @details
* @param[in]
* @return int : Return 0 on Success.
@@ -3506,10 +3506,10 @@ static int WILC_WFI_change_station(struct wiphy *wiphy,
struct net_device *dev,
* @date 01 JUL 2012
* @version 1.0
*/
-struct wireless_dev *WILC_WFI_add_virt_intf(struct wiphy *wiphy, const char
*name,
- unsigned char name_assign_type,
- enum nl80211_iftype type, u32
*flags,
- struct vif_params *params)
+struct wireless_dev *add_virtual_intf(struct wiphy *wiphy, const char *name,
+ unsigned char name_assign_type,
+ enum nl80211_iftype type, u32 *flags,
+ struct vif_params *params)
{
perInterface_wlan_t *nic;
struct WILC_WFI_priv *priv;
@@ -3567,7 +3567,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.get_key = get_key,
.set_default_key = set_default_key,
#ifdef WILC_AP_EXTERNAL_MLME
- .add_virtual_intf = WILC_WFI_add_virt_intf,
+ .add_virtual_intf = add_virtual_intf,
.del_virtual_intf = WILC_WFI_del_virt_intf,
.change_virtual_intf = WILC_WFI_change_virt_intf,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 11/31] staging: wilc1000: rename WILC_WFI_change_virt_intf
This patch replaces WILC_WFI_change_virt_intf with change_virtual_intf
to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e85f91f..4197d74 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2827,7 +2827,7 @@ int WILC_WFI_set_power_mgmt(struct wiphy *wiphy, struct
net_device *dev,
}
#ifdef WILC_AP_EXTERNAL_MLME
/**
- * @brief WILC_WFI_change_virt_intf
+ * @brief change_virtual_intf
* @detailsChange type/configuration of virtual interface,
* keep the struct wireless_dev's iftype updated.
* @param[in] NONE
@@ -2839,8 +2839,8 @@ int WILC_WFI_set_power_mgmt(struct wiphy *wiphy, struct
net_device *dev,
void wilc1000_wlan_deinit(linux_wlan_t *nic);
int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic);
-static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device
*dev,
-enum nl80211_iftype type, u32 *flags,
struct vif_params *params)
+static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
+ enum nl80211_iftype type, u32 *flags, struct
vif_params *params)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3569,7 +3569,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
#ifdef WILC_AP_EXTERNAL_MLME
.add_virtual_intf = add_virtual_intf,
.del_virtual_intf = del_virtual_intf,
- .change_virtual_intf = WILC_WFI_change_virt_intf,
+ .change_virtual_intf = change_virtual_intf,
.start_ap = WILC_WFI_start_ap,
.change_beacon = WILC_WFI_change_beacon,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 04/31] staging: wilc1000: rename WILC_WFI_disconnect
This patch replaces WILC_WFI_disconnect with disconnect to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 7f1ca95..1ebaaef 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1064,7 +1064,7 @@ done:
/**
- * @brief WILC_WFI_disconnect
+ * @brief disconnect
* @detailsDisconnect from the BSS/ESS.
* @param[in]
* @return int : Return 0 on Success
@@ -1072,7 +1072,7 @@ done:
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_disconnect(struct wiphy *wiphy, struct net_device *dev,
u16 reason_code)
+static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16
reason_code)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3561,7 +3561,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.set_monitor_channel = set_channel,
.scan = scan,
.connect = connect,
- .disconnect = WILC_WFI_disconnect,
+ .disconnect = disconnect,
.add_key = WILC_WFI_add_key,
.del_key = WILC_WFI_del_key,
.get_key = WILC_WFI_get_key,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 13/31] staging: wilc1000: rename WILC_WFI_change_beacon
This patch replaces WILC_WFI_change_beacon with change_beacon to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3853113..936db60 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3247,7 +3247,7 @@ static int start_ap(struct wiphy *wiphy, struct
net_device *dev,
}
/**
- * @brief WILC_WFI_change_beacon
+ * @brief change_beacon
* @detailsAdd a beacon with given parameters, @head, @interval
* and @dtim_period will be valid, @tail is optional.
* @param[in] wiphy
@@ -3258,8 +3258,8 @@ static int start_ap(struct wiphy *wiphy, struct
net_device *dev,
* @date 23 JUL 2013
* @version 1.0
*/
-static int WILC_WFI_change_beacon(struct wiphy *wiphy, struct net_device *dev,
- struct cfg80211_beacon_data *beacon)
+static int change_beacon(struct wiphy *wiphy, struct net_device *dev,
+struct cfg80211_beacon_data *beacon)
{
struct WILC_WFI_priv *priv;
s32 s32Error = WILC_SUCCESS;
@@ -3572,7 +3572,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.change_virtual_intf = change_virtual_intf,
.start_ap = start_ap,
- .change_beacon = WILC_WFI_change_beacon,
+ .change_beacon = change_beacon,
.stop_ap = WILC_WFI_stop_ap,
.add_station = WILC_WFI_add_station,
.del_station = WILC_WFI_del_station,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 05/31] staging: wilc1000: rename WILC_WFI_add_key
This patch replaces WILC_WFI_add_key with add_key to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 88 +++
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 1ebaaef..b5e6176 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1112,7 +1112,7 @@ static int disconnect(struct wiphy *wiphy, struct
net_device *dev, u16 reason_co
}
/**
- * @brief WILC_WFI_add_key
+ * @brief add_key
* @detailsAdd a key with the given parameters. @mac_addr will be %NULL
* when adding a group key.
* @param[in] key : key buffer; TKIP: 16-byte temporal key, 8-byte Tx Mic
key, 8-byte Rx Mic Key
@@ -1121,9 +1121,9 @@ static int disconnect(struct wiphy *wiphy, struct
net_device *dev, u16 reason_co
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8
key_index,
- bool pairwise,
- const u8 *mac_addr, struct key_params *params)
+static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8
key_index,
+ bool pairwise,
+ const u8 *mac_addr, struct key_params *params)
{
s32 s32Error = WILC_SUCCESS, KeyLen = params->key_len;
@@ -2933,19 +2933,19 @@ static int WILC_WFI_change_virt_intf(struct wiphy
*wiphy, struct net_device *dev
PRINT_D(CFG80211_DBG, "gtk %x %x %x\n",
g_key_gtk_params.key[0],
g_key_gtk_params.key[1],
g_key_gtk_params.key[2]);
-
WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
-
g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
-g_add_ptk_key_params.key_idx,
-g_add_ptk_key_params.pairwise,
-g_add_ptk_key_params.mac_addr,
-(struct key_params
*)(&g_key_ptk_params));
-
-
WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
-
g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
-g_add_gtk_key_params.key_idx,
-g_add_gtk_key_params.pairwise,
-g_add_gtk_key_params.mac_addr,
-(struct key_params
*)(&g_key_gtk_params));
+
add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+
g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
+ g_add_ptk_key_params.key_idx,
+ g_add_ptk_key_params.pairwise,
+ g_add_ptk_key_params.mac_addr,
+ (struct key_params
*)(&g_key_ptk_params));
+
+
add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+
g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
+ g_add_gtk_key_params.key_idx,
+ g_add_gtk_key_params.pairwise,
+ g_add_gtk_key_params.mac_addr,
+ (struct key_params
*)(&g_key_gtk_params));
}
/*BugID_4847: registered frames in firmware are now*/
@@ -3019,19 +3019,19 @@ static int WILC_WFI_change_virt_intf(struct wiphy
*wiphy, struct net_device *dev
PRINT_D(CFG80211_DBG, "gtk %x %x %x\n",
g_key_gtk_params.key[0],
g_key_gtk_params.key[1],
g_key_gtk_params.key[2]);
-
WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
-
g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
-g_add_ptk_key_params.key_idx,
-g_add_ptk_key_params.pairwise,
-g_add_ptk_key_params.mac_addr,
-(struct key_params
*)(&g_key_ptk_params));
-
-
WILC_WFI_add
[PATCH V3 06/31] staging: wilc1000: rename WILC_WFI_del_key
This patch replaces WILC_WFI_del_key with del_key to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index b5e6176..dfa9db3 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1403,7 +1403,7 @@ static int add_key(struct wiphy *wiphy, struct net_device
*netdev, u8 key_index,
}
/**
- * @brief WILC_WFI_del_key
+ * @brief del_key
* @detailsRemove a key given the @mac_addr (%NULL for a group key)
* and @key_index, return -ENOENT if the key doesn't
exist.
* @param[in]
@@ -1412,10 +1412,10 @@ static int add_key(struct wiphy *wiphy, struct
net_device *netdev, u8 key_index,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_del_key(struct wiphy *wiphy, struct net_device *netdev,
- u8 key_index,
- bool pairwise,
- const u8 *mac_addr)
+static int del_key(struct wiphy *wiphy, struct net_device *netdev,
+ u8 key_index,
+ bool pairwise,
+ const u8 *mac_addr)
{
struct WILC_WFI_priv *priv;
s32 s32Error = WILC_SUCCESS;
@@ -3563,7 +3563,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.connect = connect,
.disconnect = disconnect,
.add_key = add_key,
- .del_key = WILC_WFI_del_key,
+ .del_key = del_key,
.get_key = WILC_WFI_get_key,
.set_default_key = WILC_WFI_set_default_key,
#ifdef WILC_AP_EXTERNAL_MLME
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 10/31] staging: wilc1000: rename WILC_WFI_del_virt_intf
This patch replaces WILC_WFI_del_virt_intf with del_virtual_intf to
avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 5ff81cf..e85f91f 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3539,7 +3539,7 @@ struct wireless_dev *add_virtual_intf(struct wiphy
*wiphy, const char *name,
}
/**
- * @brief WILC_WFI_del_virt_intf
+ * @brief del_virtual_intf
* @details
* @param[in]
* @return int : Return 0 on Success.
@@ -3547,7 +3547,7 @@ struct wireless_dev *add_virtual_intf(struct wiphy
*wiphy, const char *name,
* @date 01 JUL 2012
* @version 1.0
*/
-int WILC_WFI_del_virt_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
/* tony for v3.8 support */
+int del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) /*
tony for v3.8 support */
{
PRINT_D(HOSTAPD_DBG, "Deleting virtual interface\n");
return WILC_SUCCESS;
@@ -3568,7 +3568,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.set_default_key = set_default_key,
#ifdef WILC_AP_EXTERNAL_MLME
.add_virtual_intf = add_virtual_intf,
- .del_virtual_intf = WILC_WFI_del_virt_intf,
+ .del_virtual_intf = del_virtual_intf,
.change_virtual_intf = WILC_WFI_change_virt_intf,
.start_ap = WILC_WFI_start_ap,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 14/31] staging: wilc1000: rename WILC_WFI_stop_ap
This patch replaces WILC_WFI_stop_ap with stop_ap to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 936db60..0b5baec 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3278,7 +3278,7 @@ static int change_beacon(struct wiphy *wiphy, struct
net_device *dev,
}
/**
- * @brief WILC_WFI_stop_ap
+ * @brief stop_ap
* @detailsRemove beacon configuration and stop sending the beacon.
* @param[in]
* @return int : Return 0 on Success.
@@ -3286,7 +3286,7 @@ static int change_beacon(struct wiphy *wiphy, struct
net_device *dev,
* @date 23 JUL 2013
* @version 1.0
*/
-static int WILC_WFI_stop_ap(struct wiphy *wiphy, struct net_device *dev)
+static int stop_ap(struct wiphy *wiphy, struct net_device *dev)
{
s32 s32Error = WILC_SUCCESS;
struct WILC_WFI_priv *priv;
@@ -3573,7 +3573,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.start_ap = start_ap,
.change_beacon = change_beacon,
- .stop_ap = WILC_WFI_stop_ap,
+ .stop_ap = stop_ap,
.add_station = WILC_WFI_add_station,
.del_station = WILC_WFI_del_station,
.change_station = WILC_WFI_change_station,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 12/31] staging: wilc1000: rename WILC_WFI_start_ap
This patch replaces WILC_WFI_start_ap with start_ap to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 4197d74..3853113 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3206,7 +3206,7 @@ static int change_virtual_intf(struct wiphy *wiphy,
struct net_device *dev,
*/
/**
- * @brief WILC_WFI_start_ap
+ * @brief start_ap
* @detailsAdd a beacon with given parameters, @head, @interval
* and @dtim_period will be valid, @tail is optional.
* @param[in] wiphy
@@ -3217,8 +3217,8 @@ static int change_virtual_intf(struct wiphy *wiphy,
struct net_device *dev,
* @date 23 JUL 2013
* @version 1.0
*/
-static int WILC_WFI_start_ap(struct wiphy *wiphy, struct net_device *dev,
-struct cfg80211_ap_settings *settings)
+static int start_ap(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_ap_settings *settings)
{
struct cfg80211_beacon_data *beacon = &(settings->beacon);
struct WILC_WFI_priv *priv;
@@ -3571,7 +3571,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.del_virtual_intf = del_virtual_intf,
.change_virtual_intf = change_virtual_intf,
- .start_ap = WILC_WFI_start_ap,
+ .start_ap = start_ap,
.change_beacon = WILC_WFI_change_beacon,
.stop_ap = WILC_WFI_stop_ap,
.add_station = WILC_WFI_add_station,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 01/31] staging: wilc1000: rename WILC_WFI_CfgSetChannel
This patch replaces WILC_WFI_CfgSetChannel with set_channel to avoid
CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 26412a5..c2060ff 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -677,7 +677,7 @@ static void CfgConnectResult(tenuConnDisconnEvent
enuConnDisconnEvent,
/**
- * @brief WILC_WFI_CfgSetChannel
+ * @brief set_channel
* @detailsSet channel for a given wireless interface. Some devices
* may support multi-channel operation (by channel
hopping) so cfg80211
* doesn't verify much. Note, however, that the passed
netdev may be
@@ -689,8 +689,8 @@ static void CfgConnectResult(tenuConnDisconnEvent
enuConnDisconnEvent,
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy,
- struct cfg80211_chan_def *chandef)
+static int set_channel(struct wiphy *wiphy,
+ struct cfg80211_chan_def *chandef)
{
u32 channelnum = 0;
@@ -3230,7 +3230,7 @@ static int WILC_WFI_start_ap(struct wiphy *wiphy, struct
net_device *dev,
PRINT_D(HOSTAPD_DBG, "Interval = %d\n DTIM period = %d\n Head length =
%zu Tail length = %zu\n",
settings->beacon_interval, settings->dtim_period,
beacon->head_len, beacon->tail_len);
- s32Error = WILC_WFI_CfgSetChannel(wiphy, &settings->chandef);
+ s32Error = set_channel(wiphy, &settings->chandef);
if (s32Error != WILC_SUCCESS)
PRINT_ER("Error in setting channel\n");
@@ -3558,7 +3558,7 @@ int WILC_WFI_del_virt_intf(struct wiphy *wiphy, struct
wireless_dev *wdev)
#endif /*WILC_AP_EXTERNAL_MLME*/
static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
- .set_monitor_channel = WILC_WFI_CfgSetChannel,
+ .set_monitor_channel = set_channel,
.scan = WILC_WFI_CfgScan,
.connect = WILC_WFI_CfgConnect,
.disconnect = WILC_WFI_disconnect,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V3 03/31] staging: wilc1000: rename WILC_WFI_CfgConnect
This patch replaces WILC_WFI_CfgConnect with connect to avoid CamelCase.
Signed-off-by: Chaehyun Lim
---
V3: remove "wilc_" prefix
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 2c39179..7f1ca95 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -806,7 +806,7 @@ static int scan(struct wiphy *wiphy, struct
cfg80211_scan_request *request)
}
/**
- * @brief WILC_WFI_CfgConnect
+ * @brief connect
* @detailsConnect to the ESS with the specified parameters. When
connected,
* call cfg80211_connect_result() with status code
%WLAN_STATUS_SUCCESS.
* If the connection fails for some reason, call
cfg80211_connect_result()
@@ -817,8 +817,8 @@ static int scan(struct wiphy *wiphy, struct
cfg80211_scan_request *request)
* @date 01 MAR 2012
* @version 1.0
*/
-static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev,
- struct cfg80211_connect_params *sme)
+static int connect(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_connect_params *sme)
{
s32 s32Error = WILC_SUCCESS;
u32 i;
@@ -3560,7 +3560,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.set_monitor_channel = set_channel,
.scan = scan,
- .connect = WILC_WFI_CfgConnect,
+ .connect = connect,
.disconnect = WILC_WFI_disconnect,
.add_key = WILC_WFI_add_key,
.del_key = WILC_WFI_del_key,
--
2.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 1/2] staging: wilc1000: remove unused enum
On 2015년 09월 12일 11:35, Greg KH wrote: On Fri, Sep 11, 2015 at 12:04:19PM +0900, Tony Cho wrote: From: Glen Lee This patch removes a unused enum tenuFrameClass. Signed-off-by: Glen Lee Signed-off-by: Tony Cho --- drivers/staging/wilc1000/coreconfigurator.c | 8 1 file changed, 8 deletions(-) I already applied this, why resend it? greg k-h This is one of series for the "[PATCH v2 2/2] staging: wilc1000: coreconfigurator.c: remove unused function". That's why it was sent to you. Thanks, Tony. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] atomics,cmpxchg: Privatize the inclusion of asm/cmpxchg.h
On Wed, 09 Sep 2015, Boqun Feng wrote:
After commit:
atomics: add acquire/release/relaxed variants of some atomic operations
Architectures may only provide {cmp,}xchg_relaxed definitions in
asm/cmpxchg.h. Other variants, such as {cmp,}xchg, may be built in
linux/atomic.h, which means simply including asm/cmpxchg.h may not get
the definitions of all the{cmp,}xchg variants. Therefore, we should
privatize the inclusions of asm/cmpxchg.h to keep it only included in
arch/* and replace the inclusions outside with linux/atomic.h
Acked-by: Will Deacon
Signed-off-by: Boqun Feng
fwiw,
Acked-by: Davidlohr Bueso
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] MAINTAINERS: Remove myself as nvec co-maintainer
Am Sonntag 13 September 2015, 17:23:27 schrieb Julian Andres Klode: > My device broke a long time ago, so I do not have any > chance of testing things or any reason to continue > maintaining it. > > Signed-off-by: Julian Andres Klode > Cc: Marc Dietrich thanks for all your work! Signed-off-by: Marc Dietrich > --- > MAINTAINERS | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index b60e2b2..1b2bbc3 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -9720,7 +9720,6 @@ S: Maintained > F: drivers/staging/lustre > > STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) > -M: Julian Andres Klode > M: Marc Dietrich > L: ac...@lists.launchpad.net (moderated for non-subscribers) > L: linux-te...@vger.kernel.org ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] MAINTAINERS: Remove myself as nvec co-maintainer
My device broke a long time ago, so I do not have any chance of testing things or any reason to continue maintaining it. Signed-off-by: Julian Andres Klode Cc: Marc Dietrich --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index b60e2b2..1b2bbc3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9720,7 +9720,6 @@ S:Maintained F: drivers/staging/lustre STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) -M: Julian Andres Klode M: Marc Dietrich L: ac...@lists.launchpad.net (moderated for non-subscribers) L: linux-te...@vger.kernel.org -- 2.5.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8712: usb_ops_linux: fixed a comparison coding style issue
Fixed a coding style issue where a comparison had the constant on the
left side of the test instead of being on the right side of it.
Signed-off-by: Samuel Dominguez Lorenzo
---
drivers/staging/rtl8712/usb_ops_linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8712/usb_ops_linux.c
b/drivers/staging/rtl8712/usb_ops_linux.c
index c3a4e3f..9d0d031 100644
--- a/drivers/staging/rtl8712/usb_ops_linux.c
+++ b/drivers/staging/rtl8712/usb_ops_linux.c
@@ -268,7 +268,7 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32
addr, u32 cnt, u8 *rmem)
return _FAIL;
if (!precvbuf->reuse == false || !precvbuf->pskb) {
precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue);
- if (NULL != precvbuf->pskb)
+ if (precvbuf->pskb != NULL)
precvbuf->reuse = true;
}
if (precvbuf != NULL) {
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging:comedi: Fix typo in staging/comedi
This patch fix spelling typo found in staging/comedi.
Signed-off-by: Masanari Iida
---
drivers/staging/comedi/drivers/adl_pci9118.c| 4 ++--
drivers/staging/comedi/drivers/adv_pci1710.c| 2 +-
drivers/staging/comedi/drivers/adv_pci_dio.c| 2 +-
drivers/staging/comedi/drivers/cb_pcidas.c | 4 ++--
drivers/staging/comedi/drivers/comedi_parport.c | 8
drivers/staging/comedi/drivers/daqboard2000.c | 2 +-
drivers/staging/comedi/drivers/dt2811.c | 4 ++--
drivers/staging/comedi/drivers/dt3000.c | 2 +-
drivers/staging/comedi/drivers/dt9812.c | 2 +-
drivers/staging/comedi/drivers/icp_multi.c | 2 +-
drivers/staging/comedi/drivers/jr3_pci.c| 4 ++--
drivers/staging/comedi/drivers/mf6x4.c | 2 +-
drivers/staging/comedi/drivers/mpc624.c | 2 +-
drivers/staging/comedi/drivers/ni_at_a2150.c| 2 +-
drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
drivers/staging/comedi/drivers/pcl726.c | 2 +-
drivers/staging/comedi/drivers/pcl816.c | 2 +-
drivers/staging/comedi/drivers/pcl818.c | 2 +-
drivers/staging/comedi/drivers/pcmda12.c| 4 ++--
drivers/staging/comedi/drivers/rtd520.c | 2 +-
drivers/staging/comedi/drivers/unioxx5.c| 4 ++--
drivers/staging/comedi/drivers/usbduxfast.c | 2 +-
drivers/staging/comedi/drivers/usbduxsigma.c| 2 +-
drivers/staging/comedi/drivers/vmk80xx.c| 2 +-
24 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c
b/drivers/staging/comedi/drivers/adl_pci9118.c
index fb3043d..d2322dc 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -240,7 +240,7 @@ struct pci9118_private {
struct pci9118_dmabuf dmabuf[2];
int softsshdelay; /*
* >0 use software S&H,
-* numer is requested delay in ns
+* number is requested delay in ns
*/
unsigned char softsshsample;/*
* polarity of S&H signal
@@ -965,7 +965,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct
comedi_subdevice *s)
/*
* use additional sample at end of every scan
-* to satisty DMA 32 bit transfer?
+* to satisfy DMA 32 bit transfer?
*/
devpriv->ai_add_front = 0;
devpriv->ai_add_back = 0;
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c
b/drivers/staging/comedi/drivers/adv_pci1710.c
index 0c6aa96..e5ff777 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -388,7 +388,7 @@ static int pci171x_ai_read_sample(struct comedi_device *dev,
chan = sample >> 12;
if (chan != devpriv->act_chanlist[cur_chan]) {
dev_err(dev->class_dev,
- "A/D data droput: received from channel %d,
expected %d\n",
+ "A/D data dropout: received from channel %d,
expected %d\n",
chan, devpriv->act_chanlist[cur_chan]);
return -ENODATA;
}
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c
b/drivers/staging/comedi/drivers/adv_pci_dio.c
index f1b3c5a..eb2c695 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -221,7 +221,7 @@ enum hw_io_access {
struct diosubd_data {
int chans; /* num of chans */
- int addr; /* PCI address ofset */
+ int addr; /* PCI address offset */
int regs; /* number of registers to read or 8255
subdevices */
unsigned int specflags; /* addon subdevice flags */
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c
b/drivers/staging/comedi/drivers/cb_pcidas.c
index b43e836..094c5a4 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -2,7 +2,7 @@
comedi/drivers/cb_pcidas.c
Developed by Ivan Martinez and Frank Mori Hess, with valuable help from
-David Schleef and the rest of the Comedi developers comunity.
+David Schleef and the rest of the Comedi developers community.
Copyright (C) 2001-2003 Ivan Martinez
Copyright (C) 2001,2002 Frank Mori Hess
@@ -116,7 +116,7 @@ analog triggering on 1602 series
#define ANALOG_TRIGGER 0x3 /* ext. analog trigger */
#define TRIGGER_MASK 0x3 /* start trigger mask */
#define TGPOL0x04/* invert trigger (1602 only) */
-#define TGSEL0x08/* edge/level trigerred (1602
only) */
+#define TGSEL0x08/*
drivers: staging: wilc1000 - NULL pointer dereference
Hi,
At this point I do not have the hardware.
NULL pointer deference is observed in the wilc1000.ko module on x86 target
with bus type SPI and when SPI is not ready. Following are the steps to
reproduce.
$ sudo insmod drivers/staging/wilc1000/wilc1000.ko
$ sudo ifconfig wlan1 up
wlan1 in the above command is the device controlled by 'wilc1000.ko'.
Though the target I tested is not built to support WILC1000, my test
scenario can be treated as a case where in SPI is not working or WILC1000
is not connected to the supported hardware.
I think I know a fix (pasted below) to this but cannot test it because hardware
is not available to test positive cases.
Thanks,
chandra
gcs@gcs-HP-Compaq-nx6320:~/linux/staging$ git diff
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 63f44f8..48f063d 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1634,6 +1634,12 @@ int mac_open(struct net_device *ndev)
int i = 0;
struct WILC_WFI_priv *priv;
+#ifdef WILC_SPI
+ if (!g_linux_wlan || !g_linux_wlan->wilc_spidev) {
+ netdev_err(ndev, "wilc1000: SPI device not ready\n");
+ return -ENODEV;
+ }
+#endif
nic = netdev_priv(ndev);
priv = wiphy_priv(nic->wilc_netdev->ieee80211_ptr->wiphy);
PRINT_D(INIT_DBG, "MAC OPEN[%p]\n", ndev);
gcs@gcs-HP-Compaq-nx6320:~/linux/staging$
DMESG -
.
.
.
[ 732.084744] wilc1000: module is from the staging directory, the quality is
unknown, you have been warned.
[ 732.086903] IN INIT FUNCTION
[ 732.086910] *** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***
[ 772.414455] BUG: unable to handle kernel NULL pointer dereference at 0190
[ 772.414603] IP: [] __spi_sync+0x1b/0x220
[ 772.414711] *pdpt = 0f93a001 *pde =
[ 772.414848] Oops: [#1] SMP
[ 772.414980] Modules linked in: wilc1000(OC) drbg ctr ccm bnep rfcomm lp i915
arc4 iwl3945 iwlegacy mac80211 snd_hda_codec_si3054 snd_hda_codec_analog
snd_hda_codec_generic snd_hda_intel snd_hda_codec snd_hda_core btusb
i2c_algo_bit drm_kms_helper snd_pcm btrtl btbcm cfg80211 btintel bluetooth drm
snd_hwdep snd_seq_midi snd_seq_midi_event snd_rawmidi snd_seq hp_wmi ppdev
sparse_keymap pcmcia snd_timer snd_seq_device yenta_socket snd coretemp
pcmcia_rsrc joydev pcmcia_core serio_raw tifm_7xx1 tifm_core parport_pc
soundcore lpc_ich parport wmi video mac_hid psmouse ahci libahci sdhci_pci tg3
ptp pps_core firewire_ohci sdhci firewire_core crc_itu_t
[ 772.417735] CPU: 0 PID: 3273 Comm: ifconfig Tainted: G C O
4.2.0-09334-g65da87c-dirty #16
[ 772.417817] Hardware name: Hewlett-Packard HP Compaq nx6320/30AA, BIOS 68YDU
Ver. F.0E 02/21/2008
[ 772.417899] task: cf878000 ti: cfac2000 task.ti: cfac2000
[ 772.417961] EIP: 0060:[] EFLAGS: 00010286 CPU: 0
[ 772.418025] EIP is at __spi_sync+0x1b/0x220
[ 772.418086] EAX: cfac3bbc EBX: ECX: EDX: cfac3bec
[ 772.418148] ESI: cfac3c98 EDI: cfac3bec EBP: cfac3bd0 ESP: cfac3b90
[ 772.418212] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
[ 772.418273] CR0: 8005003b CR2: 0190 CR3: 1e7e0be0 CR4: 06f0
[ 772.418336] Stack:
[ 772.418391] de692c00 0007fcb4 5554c379 00de df2c3d40 de693c00
de693c00
[ 772.418407] df2c3d40 558578a7 00de cfac3bbc cfac3bbc 0011 cfac3c98
cfac3c1c
[ 772.418407] cfac3bd8 c14d7e6f cfac3c6c e08b7af7
cfac3c58
[ 772.418407] Call Trace:
[ 772.418407] [] spi_sync+0xf/0x20
[ 772.418407] [] linux_spi_write_read+0x77/0x100 [wilc1000]
[ 772.418407] [] spi_cmd_complete+0xde/0x820 [wilc1000]
[ 772.418407] [] ? enqueue_entity+0x36b/0xed0
[ 772.418407] [] spi_internal_read+0x28/0x80 [wilc1000]
[ 772.418407] [] spi_init+0xcf/0x2a0 [wilc1000]
[ 772.418407] [] wilc_wlan_init+0x10e/0x530 [wilc1000]
[ 772.418407] [] ? native_smp_send_reschedule+0x3a/0x50
[ 772.418407] [] ? wlan_init_locks+0x6b/0x1e0 [wilc1000]
[ 772.418407] [] wilc1000_wlan_init+0x8a/0x8b0 [wilc1000]
[ 772.418407] [] ? ttwu_do_wakeup+0x17/0x100
[ 772.418407] [] ? internal_add_timer+0x75/0x80
[ 772.418407] [] ? mod_timer+0xf0/0x1d0
[ 772.418407] [] ? linux_wlan_rx_complete+0x50/0x50 [wilc1000]
[ 772.418407] [] ? wlan_deinitialize_threads.isra.10+0x100/0x100
[wilc1000]
[ 772.418407] [] ? linux_spi_deinit+0x60/0x60 [wilc1000]
[ 772.418407] [] ? wilc_debugfs_remove+0x20/0x20 [wilc1000]
[ 772.418407] [] ? linux_spi_write_read+0x100/0x100 [wilc1000]
[ 772.418407] [] ? linux_spi_init+0x40/0x40 [wilc1000]
[ 772.418407] [] ? linux_spi_write+0x1e0/0x1e0 [wilc1000]
[ 772.418407] [] ? linux_spi_read+0x160/0x160 [wilc1000]
[ 772.418407] [] ? GetIfHandler+0x250/0x250 [wilc1000]
[ 772.418407] [] ? wlan_deinit_locks.isra.3+0x50/0x50 [wilc1000]
[ 772.418407] [] ? linux_wlan_dbg+0x60/0x60 [wilc1000]
[ 772.418407] [] mac_open+0x7f/0x360 [wilc1000]
[ 772.418407] [] ? call_netdevice_notifiers_info+0
[PATCH 13/39] staging: lustre: drop null test before destroy functions
Remove unneeded NULL test.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
//
@@
expression x;
@@
-if (x != NULL)
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
@@
expression x;
@@
-if (x != NULL) {
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
x = NULL;
-}
//
Signed-off-by: Julia Lawall
---
drivers/staging/lustre/lustre/llite/super25.c | 16 +++---
drivers/staging/lustre/lustre/obdclass/genops.c| 24 +++--
drivers/staging/lustre/lustre/obdclass/lu_object.c |6 +
3 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c
b/drivers/staging/lustre/lustre/obdclass/lu_object.c
index 8e47232..e8101fe 100644
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
@@ -2052,10 +2052,8 @@ EXPORT_SYMBOL(lu_kmem_init);
void lu_kmem_fini(struct lu_kmem_descr *caches)
{
for (; caches->ckd_cache != NULL; ++caches) {
- if (*caches->ckd_cache != NULL) {
- kmem_cache_destroy(*caches->ckd_cache);
- *caches->ckd_cache = NULL;
- }
+ kmem_cache_destroy(*caches->ckd_cache);
+ *caches->ckd_cache = NULL;
}
}
EXPORT_SYMBOL(lu_kmem_fini);
diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c
b/drivers/staging/lustre/lustre/obdclass/genops.c
index 0ca7309..ad78a04 100644
--- a/drivers/staging/lustre/lustre/obdclass/genops.c
+++ b/drivers/staging/lustre/lustre/obdclass/genops.c
@@ -638,22 +638,14 @@ EXPORT_SYMBOL(class_notify_sptlrpc_conf);
void obd_cleanup_caches(void)
{
- if (obd_device_cachep) {
- kmem_cache_destroy(obd_device_cachep);
- obd_device_cachep = NULL;
- }
- if (obdo_cachep) {
- kmem_cache_destroy(obdo_cachep);
- obdo_cachep = NULL;
- }
- if (import_cachep) {
- kmem_cache_destroy(import_cachep);
- import_cachep = NULL;
- }
- if (capa_cachep) {
- kmem_cache_destroy(capa_cachep);
- capa_cachep = NULL;
- }
+ kmem_cache_destroy(obd_device_cachep);
+ obd_device_cachep = NULL;
+ kmem_cache_destroy(obdo_cachep);
+ obdo_cachep = NULL;
+ kmem_cache_destroy(import_cachep);
+ import_cachep = NULL;
+ kmem_cache_destroy(capa_cachep);
+ capa_cachep = NULL;
}
int obd_init_caches(void)
diff --git a/drivers/staging/lustre/lustre/llite/super25.c
b/drivers/staging/lustre/lustre/llite/super25.c
index e4020ce..4cf7af2 100644
--- a/drivers/staging/lustre/lustre/llite/super25.c
+++ b/drivers/staging/lustre/lustre/llite/super25.c
@@ -183,18 +183,10 @@ out_sysfs:
out_debugfs:
debugfs_remove(llite_root);
out_cache:
- if (ll_inode_cachep != NULL)
- kmem_cache_destroy(ll_inode_cachep);
-
- if (ll_file_data_slab != NULL)
- kmem_cache_destroy(ll_file_data_slab);
-
- if (ll_remote_perm_cachep != NULL)
- kmem_cache_destroy(ll_remote_perm_cachep);
-
- if (ll_rmtperm_hash_cachep != NULL)
- kmem_cache_destroy(ll_rmtperm_hash_cachep);
-
+ kmem_cache_destroy(ll_inode_cachep);
+ kmem_cache_destroy(ll_file_data_slab);
+ kmem_cache_destroy(ll_remote_perm_cachep);
+ kmem_cache_destroy(ll_rmtperm_hash_cachep);
return rc;
}
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 00/39] drop null test before destroy functions
Recent commits to kernel/git/torvalds/linux.git have made the following functions able to tolerate NULL arguments: kmem_cache_destroy (commit 3942d29918522) mempool_destroy (commit 4e3ca3e033d1) dma_pool_destroy (commit 44d7175da6ea) These patches remove the associated NULL tests for the files that I found easy to compile test. If these changes are OK, I will address the remainder later. --- arch/x86/kvm/mmu.c |6 -- block/bio-integrity.c |7 -- block/bio.c|7 -- block/blk-core.c |3 - block/elevator.c |3 - drivers/atm/he.c |7 -- drivers/block/aoe/aoedev.c |3 - drivers/block/drbd/drbd_main.c | 21 ++- drivers/block/pktcdvd.c|3 - drivers/block/rbd.c|6 -- drivers/dma/dmaengine.c|6 -- drivers/firmware/google/gsmi.c |3 - drivers/gpu/drm/i915/i915_dma.c| 19 ++ drivers/iommu/amd_iommu_init.c |7 -- drivers/md/bcache/bset.c |3 - drivers/md/bcache/request.c|3 - drivers/md/bcache/super.c |9 +-- drivers/md/dm-bufio.c |3 - drivers/md/dm-cache-target.c |3 - drivers/md/dm-crypt.c |6 -- drivers/md/dm-io.c |3 - drivers/md/dm-log-userspace-base.c |3 - drivers/md/dm-region-hash.c|4 - drivers/md/dm.c| 13 +--- drivers/md/multipath.c |3 - drivers/md/raid1.c |6 -- drivers/md/raid10.c|9 +-- drivers/md/raid5.c |3 - drivers/mtd/nand/nandsim.c |3 - drivers/mtd/ubi/attach.c |4 - drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c |3 - drivers/staging/lustre/lustre/llite/super25.c | 16 + drivers/staging/lustre/lustre/obdclass/genops.c| 24 ++-- drivers/staging/lustre/lustre/obdclass/lu_object.c |6 -- drivers/staging/rdma/hfi1/user_sdma.c |3 - drivers/thunderbolt/ctl.c |3 - drivers/usb/gadget/udc/bdc/bdc_core.c |3 - drivers/usb/gadget/udc/gr_udc.c|3 - drivers/usb/gadget/udc/mv_u3d_core.c |3 - drivers/usb/gadget/udc/mv_udc_core.c |3 - drivers/usb/host/fotg210-hcd.c | 12 +--- drivers/usb/host/fusbh200-hcd.c| 12 +--- drivers/usb/host/whci/init.c |3 - drivers/usb/host/xhci-mem.c| 12 +--- fs/btrfs/backref.c |3 - fs/btrfs/delayed-inode.c |3 - fs/btrfs/delayed-ref.c | 12 +--- fs/btrfs/disk-io.c |3 - fs/btrfs/extent_io.c |6 -- fs/btrfs/extent_map.c |3 - fs/btrfs/file.c|3 - fs/btrfs/inode.c | 18 ++ fs/btrfs/ordered-data.c|3 - fs/dlm/memory.c|6 -- fs/ecryptfs/main.c |3 - fs/ext4/crypto.c |9 +-- fs/ext4/extents_status.c |3 - fs/ext4/mballoc.c |3 - fs/f2fs/crypto.c |9 +-- fs/gfs2/main.c | 29 ++ fs/jbd2/journal.c | 15 + fs/jbd2/revoke.c | 12 +--- fs/jbd2/transaction.c |6 -- fs/jffs2/malloc.c | 27 +++-- fs/nfsd/nfscache.c |6 -- fs/nilfs2/super.c | 12 +--- fs/ocfs2/dlm/dlmlock.c |3 - fs/ocfs2/dlm/dlmmaster.c | 16 + fs/ocfs2/super.c | 18 ++ fs/ocfs2/uptodate.c|3 - lib/debugobjects.c |3 - net/core/sock.c| 12 +--- net/dccp/ackvec.c | 12 +--- net/dccp/ccid.c
[PATCH 11/39] hfi1: drop null test before destroy functions
Remove unneeded NULL test. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x; @@ -if (x != NULL) \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x); // Signed-off-by: Julia Lawall --- drivers/staging/rdma/hfi1/user_sdma.c |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rdma/hfi1/user_sdma.c b/drivers/staging/rdma/hfi1/user_sdma.c index 5552661..6620262 100644 --- a/drivers/staging/rdma/hfi1/user_sdma.c +++ b/drivers/staging/rdma/hfi1/user_sdma.c @@ -486,8 +486,7 @@ int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd) } kfree(pq->reqs); } - if (pq->txreq_cache) - kmem_cache_destroy(pq->txreq_cache); + kmem_cache_destroy(pq->txreq_cache); kfree(pq); fd->pq = NULL; } ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: wilc1000: Added a new line
Added a new line after declaration to remove a coding style warning
detected by checkpatch. The warning is given below
WARNING: Missing a blank line after declarations
Signed-off-by: Aparna Karuthodi
---
drivers/staging/wilc1000/coreconfigurator.c |1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c
b/drivers/staging/wilc1000/coreconfigurator.c
index ed6ac45..0c964c6 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -2101,6 +2101,7 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
u32 u32WIDsCount, bool bRespRequired, u32 drvHandler)
{
s32 counter = 0, ret = 0;
+
if (gpstrWlanOps == NULL) {
PRINT_D(CORECONFIG_DBG, "Net Dev is still not initialized\n");
return 1;
--
1.7.9.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: dgnc: Fixed line over 80 characters long
This is a patch that fixes line over 80 characters coding style warning detected by checkpatch.pl. WARNING: line over 80 characters Signed-off-by: Anjali Menon --- drivers/staging/dgnc/dgnc_mgmt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/dgnc/dgnc_mgmt.c b/drivers/staging/dgnc/dgnc_mgmt.c index b13318a..81c793a 100644 --- a/drivers/staging/dgnc/dgnc_mgmt.c +++ b/drivers/staging/dgnc/dgnc_mgmt.c @@ -148,7 +148,8 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) di.info_bdstate = dgnc_Board[brd]->dpastatus; di.info_ioport = 0; di.info_physaddr = (ulong) dgnc_Board[brd]->membase; - di.info_physsize = (ulong) dgnc_Board[brd]->membase - dgnc_Board[brd]->membase_end; + di.info_physsize = (ulong) dgnc_Board[brd]->membase + - dgnc_Board[brd]->membase_end; if (dgnc_Board[brd]->state != BOARD_FAILED) di.info_nports = dgnc_Board[brd]->nasync; else -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: lustre: lnet: lnet: Added a space
Added a space to fix the following coding style warning detected by
checkpatch:
WARNING: space prohibited between function name and open parenthesis '('
Signed-off-by: Anjali Menon
---
drivers/staging/lustre/lnet/lnet/router.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lnet/lnet/router.c
b/drivers/staging/lustre/lnet/lnet/router.c
index 8510bae..be23e06 100644
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -1511,7 +1511,7 @@ lnet_notify(lnet_ni_t *ni, lnet_nid_t nid, int alive,
unsigned long when)
unsigned long now = cfs_time_current();
int cpt = lnet_cpt_of_nid(nid);
- LASSERT(!in_interrupt ());
+ LASSERT(!in_interrupt());
CDEBUG(D_NET, "%s notifying %s: %s\n",
(ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid),
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
