Re: [PATCH 3/3] ath10k: implement mesh support

[Johannes Berg]

On Wed, 2015-09-09 at 12:49 -0400, Bob Copeland wrote:
> On Wed, Sep 09, 2015 at 12:10:38PM +0300, Kalle Valo wrote:
> > > I did a quick smoke test and saw the splat below. It's this 
> > > warning from
> > > cfg80211:
> > > 
> > >   /*
> > >* Don't advertise an unsupported type
> > >* in a combination.
> > >*/
> > >   if (WARN_ON((wiphy->interface_modes & 
> > > types) != types))
> > >   return -EINVAL;
> 
> OK, this happens when mesh is configured out (we mask off the mesh
> interface_modes internally but not the types).  Sent an updated 
> version with appropriate ifdefs added.

Yeah this is an unfortunate quirk in the APIs ... I think adding the
ifdefs to the driver is the best thing to do.

johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 5/5] staging: wilc1000: coreconfigurator.c: remove unused functions

[Tony Cho]

From: Glen Lee 

This patch removes following unused funtions which will not be used anymore.

ascii_hex_to_dec
get_hex_char
extract_mac_addr
create_mac_addr
conv_ip_to_int
conv_int_to_ip
get_wid_type
get_type
CreateConfigPacket
ConfigWaitResponse
ConfigProvideResponse
ConfigPktReceived
ParseWriteResponse
CreatePacketHeader
ParseResponse
ProcessBinWid
ProcessAdrWid
ProcessStrWid
ProcessIPwid
ProcessIntWid
ProcessShortWid
ProcessCharWid

As a result, four global variable causes defined but not used compile warnings.
So just remove unused varialbs g_seqno, g_wid_num, Res_Len and g_oper_mode.

Signed-off-by: Glen Lee 
Signed-off-by: Tony Cho 
---
 drivers/staging/wilc1000/coreconfigurator.c | 151 
 1 file changed, 151 deletions(-)

diff --git a/drivers/staging/wilc1000/coreconfigurator.c 
b/drivers/staging/wilc1000/coreconfigurator.c
index 450c3ff..f339085 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -1789,157 +1789,6 @@ s32 CreatePacketHeader(char *pcpacket, s32 
*ps32PacketLength)
 }
 
 /**
- *  @brief  creates Configuration packet based on the Input WIDs
- *  @details
- *  @param[in]  pstrWIDs WIDs to be sent in the configuration packet
- *  @param[in]  u32WIDsCount number of WIDs to be sent in the configuration 
packet
- *  @param[out] ps8packet The created Configuration Packet
- *  @param[out] ps32PacketLength Length of the created Configuration 
Packet
- *  @return Error code indicating success/failure
- *  @note
- *  @author
- *  @date  1 Mar 2012
- *  @version   1.0
- */
-
-s32 CreateConfigPacket(s8 *ps8packet, s32 *ps32PacketLength,
-  tstrWID *pstrWIDs, u32 u32WIDsCount)
-{
-   s32 s32Error = WILC_SUCCESS;
-   u32 u32idx = 0;
-   *ps32PacketLength = MSG_HEADER_LEN;
-   for (u32idx = 0; u32idx < u32WIDsCount; u32idx++) {
-   switch (pstrWIDs[u32idx].enuWIDtype) {
-   case WID_CHAR:
-   ProcessCharWid(ps8packet, ps32PacketLength, 
[u32idx],
-  pstrWIDs[u32idx].ps8WidVal);
-   break;
-
-   case WID_SHORT:
-   ProcessShortWid(ps8packet, ps32PacketLength, 
[u32idx],
-   pstrWIDs[u32idx].ps8WidVal);
-   break;
-
-   case WID_INT:
-   ProcessIntWid(ps8packet, ps32PacketLength, 
[u32idx],
- pstrWIDs[u32idx].ps8WidVal);
-   break;
-
-   case WID_STR:
-   ProcessStrWid(ps8packet, ps32PacketLength, 
[u32idx],
- pstrWIDs[u32idx].ps8WidVal, 
pstrWIDs[u32idx].s32ValueSize);
-   break;
-
-   case WID_IP:
-   ProcessIPwid(ps8packet, ps32PacketLength, 
[u32idx],
-pstrWIDs[u32idx].ps8WidVal);
-   break;
-
-   case WID_BIN_DATA:
-   ProcessBinWid(ps8packet, ps32PacketLength, 
[u32idx],
- pstrWIDs[u32idx].ps8WidVal, 
pstrWIDs[u32idx].s32ValueSize);
-   break;
-
-   default:
-   PRINT_ER("ERROR: Check Config database\n");
-   }
-   }
-
-   CreatePacketHeader(ps8packet, ps32PacketLength);
-
-   return s32Error;
-}
-
-s32 ConfigWaitResponse(char *pcRespBuffer, s32 s32MaxRespBuffLen, s32 
*ps32BytesRead,
-  bool bRespRequired)
-{
-   s32 s32Error = WILC_SUCCESS;
-   /*bug 3878*/
-   /*removed to caller function*/
-   /*gstrConfigPktInfo.pcRespBuffer = pcRespBuffer;
-* gstrConfigPktInfo.s32MaxRespBuffLen = s32MaxRespBuffLen;
-* gstrConfigPktInfo.bRespRequired = bRespRequired;*/
-
-
-   if (gstrConfigPktInfo.bRespRequired) {
-   down();
-
-   *ps32BytesRead = gstrConfigPktInfo.s32BytesRead;
-   }
-
-   memset((void *)(), 0, sizeof(tstrConfigPktInfo));
-
-   return s32Error;
-}
-
-s32 ConfigProvideResponse(char *pcRespBuffer, s32 s32RespLen)
-{
-   s32 s32Error = WILC_SUCCESS;
-
-   if (gstrConfigPktInfo.bRespRequired) {
-   if (s32RespLen <= gstrConfigPktInfo.s32MaxRespBuffLen) {
-   memcpy(gstrConfigPktInfo.pcRespBuffer, pcRespBuffer, 
s32RespLen);
-   gstrConfigPktInfo.s32BytesRead = s32RespLen;
-   } else {
-   memcpy(gstrConfigPktInfo.pcRespBuffer, pcRespBuffer, 
gstrConfigPktInfo.s32MaxRespBuffLen);
-   gstrConfigPktInfo.s32BytesRead = 
gstrConfigPktInfo.s32MaxRespBuffLen;
-   PRINT_ER("BusProvideResponse() Response greater than 
the prepared Buffer Size\n");
-   

[PATCH] ibss: add VHT80 support for IBSS

[Janusz Dziedzic]

Add VHT80 support for IBSS.

eg. iw wlan0 ibss join 5180 80MHZ
iw wlan0 ibbs join 5220 80MHZ

Signed-off-by: Janusz Dziedzic 
---
 ibss.c | 48 
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/ibss.c b/ibss.c
index 7a0b707..460f549 100644
--- a/ibss.c
+++ b/ibss.c
@@ -16,6 +16,38 @@
 
 SECTION(ibss);
 
+struct chanmode {
+   const char *name;
+   unsigned int width;
+   int freq1_diff;
+   int chantype; /* for older kernel */
+};
+
+static int get_cf1(const struct chanmode *chanmode, unsigned long freq) {
+   int cf1 = freq, j;
+   int vht80[] = { 5180, 5260, 5500, 5580, 5660, 5745 };
+
+   switch (chanmode->width) {
+   case NL80211_CHAN_WIDTH_80:
+   /* setup center_freq1 */
+   for (j = 0; j < ARRAY_SIZE(vht80); j++) {
+   if (freq >= vht80[j] && freq < vht80[j] + 80)
+   break;
+   }
+
+   if (j == ARRAY_SIZE(vht80))
+   break;
+
+   cf1 = vht80[j] + 30;
+   break;
+   default:
+   cf1 = freq + chanmode->freq1_diff;
+   break;
+   }
+
+   return cf1;
+}
+
 static int join_ibss(struct nl80211_state *state,
 struct nl_msg *msg,
 int argc, char **argv,
@@ -30,12 +62,8 @@ static int join_ibss(struct nl80211_state *state,
int bintval;
int i;
unsigned long freq;
-   static const struct {
-   const char *name;
-   unsigned int width;
-   int freq1_diff;
-   int chantype; /* for older kernel */
-   } *chanmode_selected = NULL, chanmode[] = {
+   const struct chanmode *chanmode_selected = NULL;
+   static const struct chanmode chanmode[] = {
{ .name = "HT20",
  .width = NL80211_CHAN_WIDTH_20,
  .freq1_diff = 0,
@@ -60,6 +88,10 @@ static int join_ibss(struct nl80211_state *state,
  .width = NL80211_CHAN_WIDTH_10,
  .freq1_diff = 0,
  .chantype = -1 },
+   { .name = "80MHZ",
+ .width = NL80211_CHAN_WIDTH_80,
+ .freq1_diff = 0,
+ .chantype = -1 },
};
 
if (argc < 2)
@@ -90,7 +122,7 @@ static int join_ibss(struct nl80211_state *state,
NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
chanmode_selected->width);
NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1,
-   freq + chanmode_selected->freq1_diff);
+   get_cf1(chanmode_selected, freq));
if (chanmode_selected->chantype != -1)
NLA_PUT_U32(msg,
NL80211_ATTR_WIPHY_CHANNEL_TYPE,
@@ -192,7 +224,7 @@ COMMAND(ibss, leave, NULL,
NL80211_CMD_LEAVE_IBSS, 0, CIB_NETDEV, leave_ibss,
"Leave the current IBSS cell.");
 COMMAND(ibss, join,
-   "  [HT20|HT40+|HT40-|NOHT|5MHZ|10MHZ] [fixed-freq] 
[] [beacon-interval ]"
+   "  [HT20|HT40+|HT40-|NOHT|5MHZ|10MHZ|80MHZ] 
[fixed-freq] [] [beacon-interval ]"
" [basic-rates ] [mcast-rate ] "
"[key d:0:abcde]",
NL80211_CMD_JOIN_IBSS, 0, CIB_NETDEV, join_ibss,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] carl9170: fix bad rssi reading

[Hiroaki KAWAI]

Fix rssi calculation error which was introduced in otus to ar9170
porting.

Signed-off-by: Hiroaki KAWAI 
---
 drivers/net/wireless/ath/carl9170/rx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/carl9170/rx.c 
b/drivers/net/wireless/ath/carl9170/rx.c
index 924135b..d66533c 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -453,7 +453,7 @@ static void carl9170_rx_phy_status(struct ar9170 *ar,
/* post-process RSSI */
for (i = 0; i < 7; i++)
if (phy->rssi[i] & 0x80)
-   phy->rssi[i] = ((phy->rssi[i] & 0x7f) + 1) & 0x7f;
+   phy->rssi[i] = ((~phy->rssi[i] & 0x7f) + 1) & 0x7f;
 
/* TODO: we could do something with phy_errors */
status->signal = ar->noise[0] + phy->rssi_combined;
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] net/mac80211/rate.c: fix wrong sizeof()

[Johannes Berg]

On Wed, 2015-09-09 at 21:56 +0100, Sergei Trofimovich wrote:
> From: Sergei Trofimovich 
> 
> Noticed by gcc-5.2.0:
> 
> net/mac80211/rate.c: In function 'rate_control_cap_mask':
> net/mac80211/rate.c:719:25: warning: 'sizeof' on array function 
> parameter 'mcs_mask' will return size of 'u8 * {aka unsigned char *}' 
> [-Wsizeof-array-argument]
>for (i = 0; i < sizeof(mcs_mask); i++)
>  ^
> 
We already merged a fix for this.

johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/5] staging: wilc1000: remove firmware definition

[Tony Cho]

This patch removes the firmware definitions, STA_FIRMWARE, AP_FIRMWARE, and
P2P_CONCURRENCY_FIRMWARE from the linux_wlan.c file because they are
defined in the Makefile.

Signed-off-by: Tony Cho 
---
 drivers/staging/wilc1000/linux_wlan.c | 12 
 1 file changed, 12 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c 
b/drivers/staging/wilc1000/linux_wlan.c
index df5ee26..8e19095 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -101,18 +101,6 @@ static struct notifier_block g_dev_notifier = {
if (g_linux_wlan->oup.wlan_cleanup != NULL) \
g_linux_wlan->oup.wlan_cleanup(); }
 
-#ifndef STA_FIRMWARE
-#define STA_FIRMWARE   "wifi_firmware.bin"
-#endif
-
-#ifndef AP_FIRMWARE
-#define AP_FIRMWARE"wifi_firmware_ap.bin"
-#endif
-
-#ifndef P2P_CONCURRENCY_FIRMWARE
-#define P2P_CONCURRENCY_FIRMWARE   "wifi_firmware_p2p_concurrency.bin"
-#endif
-
 typedef struct android_wifi_priv_cmd {
char *buf;
int used_len;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 4/5] staging: wilc1000: remove unused enum

[Tony Cho]

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(-)

diff --git a/drivers/staging/wilc1000/coreconfigurator.c 
b/drivers/staging/wilc1000/coreconfigurator.c
index 58e6108..450c3ff 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -88,14 +88,6 @@ typedef enum {
FRAME_SUBTYPE_FORCE_32BIT  = 0x
 } tenuFrmSubtype;
 
-/* Basic Frame Classes */
-typedef enum {
-   CLASS1_FRAME_TYPE  = 0x00,
-   CLASS2_FRAME_TYPE  = 0x01,
-   CLASS3_FRAME_TYPE  = 0x02,
-   FRAME_CLASS_FORCE_32BIT  = 0x
-} tenuFrameClass;
-
 /* Element ID  of various Information Elements */
 typedef enum {
ISSID   = 0,   /* Service Set Identifier */
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] carl9170: fix bad rssi reading

[Christian Lamparter]

On Thursday, September 10, 2015 06:04:45 PM Hiroaki KAWAI wrote:
> Fix rssi calculation error which was introduced in otus to ar9170
> porting.
> 
> Signed-off-by: Hiroaki KAWAI 
Acked-by: Christian Lamparter 

For reference: Here's the line in the original otus code:


This value/result isn't used anywhere, so we could also remove it. 

> ---
>  drivers/net/wireless/ath/carl9170/rx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/carl9170/rx.c 
> b/drivers/net/wireless/ath/carl9170/rx.c
> index 924135b..d66533c 100644
> --- a/drivers/net/wireless/ath/carl9170/rx.c
> +++ b/drivers/net/wireless/ath/carl9170/rx.c
> @@ -453,7 +453,7 @@ static void carl9170_rx_phy_status(struct ar9170 *ar,
>   /* post-process RSSI */
>   for (i = 0; i < 7; i++)
>   if (phy->rssi[i] & 0x80)
> - phy->rssi[i] = ((phy->rssi[i] & 0x7f) + 1) & 0x7f;
> + phy->rssi[i] = ((~phy->rssi[i] & 0x7f) + 1) & 0x7f;
>  
>   /* TODO: we could do something with phy_errors */
>   status->signal = ar->noise[0] + phy->rssi_combined;
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 3/5] staging: wilc1000: use id value as argument

[Shin, Austin]

Team, Thanks for all you hardworking on complex problem. Thanks Johnny, Tony, 
Nicolas, and especially Greg.
Best regards,
Austin

-Original Message-
From: Greg KH [mailto:gre...@linuxfoundation.org] 
Sent: Saturday, September 05, 2015 1:24 AM
To: Kim, Johnny
Cc: Cho, Tony; de...@driverdev.osuosl.org; linux-wireless@vger.kernel.org; 
Park, Chris; Kim, Rachel; Lee, Glen; Kim, Leo; Lee, Jude; Hwang, Robin; Shin, 
Austin; Noureldin, Adel; Abozaeid, Adham; Ferre, Nicolas
Subject: Re: [PATCH 3/5] staging: wilc1000: use id value as argument

On Fri, Sep 04, 2015 at 03:01:55PM +0900, johnny.kim wrote:
> 
> 
> On 2015년 09월 04일 12:51, Greg KH wrote:
> >On Fri, Sep 04, 2015 at 12:24:29PM +0900, johnny.kim wrote:
> >>
> >>On 2015년 09월 04일 00:47, Greg KH wrote:
> >>>On Thu, Sep 03, 2015 at 04:00:08PM +0900, johnny.kim wrote:
> Hello Greg.
> 
> On 2015년 09월 03일 10:33, Greg KH wrote:
> >On Thu, Aug 20, 2015 at 04:32:52PM +0900, Tony Cho wrote:
> >>From: Johnny Kim 
> >>
> >>The driver communicates with the chipset via the address of 
> >>handlers to distinguish async data frame. The SendConfigPkt 
> >>function gets the pointer address indicating the handlers as the 
> >>last argument, but this requires redundant typecasting and does not 
> >>support the 64 bit machine.
> >>
> >>This patch adds the function which assigns ID values instead of 
> >>pointer representing the driver handler to the address and then 
> >>uses the ID instead of pointer as the last argument of 
> >>SendConfigPkt. The driver also gets the handler's address from 
> >>the ID in the data frame when it receives them.
> >>
> >I don't understand this code at all.  You are randomly adding 
> >values to a list, and then assuming that you can use the index 
> >into that list for some type of representation?  As this is a 
> >local list, why not just use the real variables instead of having 
> >a list and dealing with them in this very ackward manner?
> >
> >In other words, I don't see the need for the list at all, just 
> >use the real types here, you have all the needed information 
> >(hint, if you know the index, you really know the data as 
> >well...)
> >
> The value is needed to send it to chipset and to distinguish async 
> data packet mutually.
> >>>What is the value, the index or some random pointer?
> >>The value of current patch substitutes the corresponding index for 
> >>some random pointer(= address of device handler).
> >Ok.
> >
> The length of the data field is 4byte and the data field has been 
> filled with the address of pointer so far.
> >>>So the data field can just be any random number, as long as it is 
> >>>consistent?  What does the chip do with the random number?
> >>Current driver normally create a couple of network interface.
> >Multiple network interfaces for the same hardware?
> Yes. A chipset supports multiple network interface.
> >>The driver can send some commands(data frame) to the network 
> >>interfaces at the same time and wait the results. Both driver and 
> >>chipset need unique value to distinguish whom the interface owner of 
> >>the commands is.
> >>And the value always has same value while the interface is alive.
> >But as you created the interfaces, just use a unique number for each.
> >It could be a #define, as you know how many interfaces you will 
> >create, that's not a dynamic thing.  No need to keep looking up 
> >something in an index and converting to a structure.
> I think your opinion is right only if the driver send some commands to 
> chipset. The driver should look for the network interface 
> corresponding to the #define value to know owner of data frame which 
> received from chipset. Network interface structure dynamically is 
> allocated as 'ifconfig up'
> command of shell. As a result, look-up table is needed.
> 
> But this patch changes it to unique index value corresponding to 
> the address for 64bit address machine. If real type is used as 
> your opinion, new patch will have the same meaning with current code.
> >>>index now, but was using a pointer before?  That sounds like you 
> >>>are changing the functionality.
> >>>
> >>>confused,
> >>There is a reserved field to distinguish the data frames in chipset.
> >>Because the field has 4byte space, this patch creates the index 
> >>corresponding to the pointer and uses the index to input the 
> >>identifier in the size instead of the pointer value.
> >>
> >>I'm sorry, too. It's not easy to explain it in English.
> >It's not easy to explain that in any language :)
> Thanks for your generous mind.
> >As you "know" the interfaces you create, just use a "fixed" number 
> >for them, and refer to them that way.  No need to have an array and 
> >iterate over the whole array every time.
> >
> >There are lots of wrapper functions and pointers in this driver that 
> >need to be 

[PATCH 1/2] mwifiex: remove USB8897 chipset support

[Amitkumar Karwar]

We don't have any customer using this chipset via USB
interface. if both mwifiex_pcie and mwifiex_usb modules
are enabled by user, sometimes mwifiex_usb wins the race
even if user wants wlan interface to be on PCIe and
USB for bluetooth. This patch solves the problem.

Signed-off-by: Amitkumar Karwar 
Signed-off-by: Frank Huang 
Signed-off-by: Nishant Sarmukadam 
Signed-off-by: Cathy Luo 
---
 drivers/net/wireless/mwifiex/Kconfig |  4 ++--
 drivers/net/wireless/mwifiex/usb.c   | 14 --
 drivers/net/wireless/mwifiex/usb.h   |  3 ---
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/Kconfig 
b/drivers/net/wireless/mwifiex/Kconfig
index 317d991..279167d 100644
--- a/drivers/net/wireless/mwifiex/Kconfig
+++ b/drivers/net/wireless/mwifiex/Kconfig
@@ -33,12 +33,12 @@ config MWIFIEX_PCIE
  mwifiex_pcie.
 
 config MWIFIEX_USB
-   tristate "Marvell WiFi-Ex Driver for USB8766/8797/8897/8997"
+   tristate "Marvell WiFi-Ex Driver for USB8766/8797/8997"
depends on MWIFIEX && USB
select FW_LOADER
---help---
  This adds support for wireless adapters based on Marvell
- 8797/8897/8997 chipset with USB interface.
+ 8797/8997 chipset with USB interface.
 
  If you choose to build it as a module, it will be called
  mwifiex_usb.
diff --git a/drivers/net/wireless/mwifiex/usb.c 
b/drivers/net/wireless/mwifiex/usb.c
index 5e789b2..bc8619d 100644
--- a/drivers/net/wireless/mwifiex/usb.c
+++ b/drivers/net/wireless/mwifiex/usb.c
@@ -42,11 +42,6 @@ static struct usb_device_id mwifiex_usb_table[] = {
{USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8801_PID_2,
   USB_CLASS_VENDOR_SPEC,
   USB_SUBCLASS_VENDOR_SPEC, 0xff)},
-   /* 8897 */
-   {USB_DEVICE(USB8XXX_VID, USB8897_PID_1)},
-   {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8897_PID_2,
-  USB_CLASS_VENDOR_SPEC,
-  USB_SUBCLASS_VENDOR_SPEC, 0xff)},
/* 8997 */
{USB_DEVICE(USB8XXX_VID, USB8997_PID_1)},
{USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8997_PID_2,
@@ -386,14 +381,12 @@ static int mwifiex_usb_probe(struct usb_interface *intf,
case USB8766_PID_1:
case USB8797_PID_1:
case USB8801_PID_1:
-   case USB8897_PID_1:
case USB8997_PID_1:
card->usb_boot_state = USB8XXX_FW_DNLD;
break;
case USB8766_PID_2:
case USB8797_PID_2:
case USB8801_PID_2:
-   case USB8897_PID_2:
case USB8997_PID_2:
card->usb_boot_state = USB8XXX_FW_READY;
break;
@@ -827,12 +820,6 @@ static int mwifiex_register_dev(struct mwifiex_adapter 
*adapter)
strcpy(adapter->fw_name, USB8997_DEFAULT_FW_NAME);
adapter->ext_scan = true;
break;
-   case USB8897_PID_1:
-   case USB8897_PID_2:
-   adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K;
-   strcpy(adapter->fw_name, USB8897_DEFAULT_FW_NAME);
-   adapter->ext_scan = true;
-   break;
case USB8766_PID_1:
case USB8766_PID_2:
adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
@@ -1135,5 +1122,4 @@ MODULE_LICENSE("GPL v2");
 MODULE_FIRMWARE(USB8766_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(USB8797_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(USB8801_DEFAULT_FW_NAME);
-MODULE_FIRMWARE(USB8897_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(USB8997_DEFAULT_FW_NAME);
diff --git a/drivers/net/wireless/mwifiex/usb.h 
b/drivers/net/wireless/mwifiex/usb.h
index f0051f8..1be82d3 100644
--- a/drivers/net/wireless/mwifiex/usb.h
+++ b/drivers/net/wireless/mwifiex/usb.h
@@ -28,8 +28,6 @@
 #define USB8766_PID_2  0x2042
 #define USB8797_PID_1  0x2043
 #define USB8797_PID_2  0x2044
-#define USB8897_PID_1  0x2045
-#define USB8897_PID_2  0x2046
 #define USB8801_PID_1  0x2049
 #define USB8801_PID_2  0x204a
 #define USB8997_PID_1  0x204d
@@ -47,7 +45,6 @@
 #define USB8766_DEFAULT_FW_NAME"mrvl/usb8766_uapsta.bin"
 #define USB8797_DEFAULT_FW_NAME"mrvl/usb8797_uapsta.bin"
 #define USB8801_DEFAULT_FW_NAME"mrvl/usb8801_uapsta.bin"
-#define USB8897_DEFAULT_FW_NAME"mrvl/usb8897_uapsta.bin"
 #define USB8997_DEFAULT_FW_NAME"mrvl/usb8997_uapsta.bin"
 
 #define FW_DNLD_TX_BUF_SIZE620
-- 
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] carl9170: fix bad rssi reading

[Hiroaki Kawai]

That field is union and referenced as rssi_combined at two lines below.

The status->signal will show up in radiotap IEEE80211_RADIOTAP_DBM_ANTSIGNAL
header field at userland finally.

2015-09-10 22:07 GMT+09:00 Christian Lamparter :
> On Thursday, September 10, 2015 06:04:45 PM Hiroaki KAWAI wrote:
>> Fix rssi calculation error which was introduced in otus to ar9170
>> porting.
>>
>> Signed-off-by: Hiroaki KAWAI 
> Acked-by: Christian Lamparter 
>
> For reference: Here's the line in the original otus code:
> 
>
> This value/result isn't used anywhere, so we could also remove it.
>
>> ---
>>  drivers/net/wireless/ath/carl9170/rx.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/wireless/ath/carl9170/rx.c 
>> b/drivers/net/wireless/ath/carl9170/rx.c
>> index 924135b..d66533c 100644
>> --- a/drivers/net/wireless/ath/carl9170/rx.c
>> +++ b/drivers/net/wireless/ath/carl9170/rx.c
>> @@ -453,7 +453,7 @@ static void carl9170_rx_phy_status(struct ar9170 *ar,
>>   /* post-process RSSI */
>>   for (i = 0; i < 7; i++)
>>   if (phy->rssi[i] & 0x80)
>> - phy->rssi[i] = ((phy->rssi[i] & 0x7f) + 1) & 0x7f;
>> + phy->rssi[i] = ((~phy->rssi[i] & 0x7f) + 1) & 0x7f;
>>
>>   /* TODO: we could do something with phy_errors */
>>   status->signal = ar->noise[0] + phy->rssi_combined;
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 4/4] Staging: rtl8723au: core: Remove unused variable

[Jes Sorensen]

Shraddha Barke  writes:
> This patch discards the variable as it is not used anywhere throughout
> the kernel.
>
> Signed-off-by: Shraddha Barke 
> ---
>  drivers/staging/rtl8723au/core/rtw_security.c | 9 -
>  1 file changed, 9 deletions(-)

Acked-by: Jes Sorensen 

>
> diff --git a/drivers/staging/rtl8723au/core/rtw_security.c 
> b/drivers/staging/rtl8723au/core/rtw_security.c
> index 3d40bab..82518cd 100644
> --- a/drivers/staging/rtl8723au/core/rtw_security.c
> +++ b/drivers/staging/rtl8723au/core/rtw_security.c
> @@ -608,7 +608,6 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
>   u8 hw_hdr_offset = 0;
>   struct arc4context mycontext;
>   int curfragnum, length;
> - u32 prwskeylen;
>   u8 *pframe, *payload, *iv, *prwskey;
>   union pn48 dot11txpn;
>   struct sta_info *stainfo;
> @@ -655,8 +654,6 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
>   else
>   prwskey = >dot118021x_UncstKey.skey[0];
>  
> - prwskeylen = 16;
> -
>   /* 4 start to encrypt each fragment */
>   for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
>   iv = pframe + pattrib->hdrlen;
> @@ -719,7 +716,6 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
>   u32 actual_crc, expected_crc;
>   struct arc4context mycontext;
>   int length;
> - u32 prwskeylen;
>   u8 *pframe, *payload, *iv, *prwskey;
>   union pn48 dot11txpn;
>   struct sta_info *stainfo;
> @@ -749,12 +745,10 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
>   goto exit;
>   }
>   prwskey = 
> psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
> - prwskeylen = 16;
>   } else {
>   RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
>"%s: stainfo!= NULL!!!\n", __func__);
>   prwskey = >dot118021x_UncstKey.skey[0];
> - prwskeylen = 16;
>   }
>  
>   iv = pframe + prxattrib->hdrlen;
> @@ -1288,7 +1282,6 @@ int rtw_aes_encrypt23a(struct rtw_adapter *padapter,
>  {/* exclude ICV */
>   /* Intermediate Buffers */
>   int curfragnum, length;
> - u32 prwskeylen;
>   u8 *pframe, *prwskey;
>   u8 hw_hdr_offset = 0;
>   struct sta_info *stainfo;
> @@ -1335,8 +1328,6 @@ int rtw_aes_encrypt23a(struct rtw_adapter *padapter,
>   else
>   prwskey = >dot118021x_UncstKey.skey[0];
>  
> - prwskeylen = 16;
> -
>   for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
>   /* 4 the last fragment */
>   if ((curfragnum + 1) == pattrib->nr_frags) {
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 1/2] staging: wilc1000: remove unused enum

[Tony Cho]

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(-)

diff --git a/drivers/staging/wilc1000/coreconfigurator.c 
b/drivers/staging/wilc1000/coreconfigurator.c
index 58e6108..450c3ff 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -88,14 +88,6 @@ typedef enum {
FRAME_SUBTYPE_FORCE_32BIT  = 0x
 } tenuFrmSubtype;
 
-/* Basic Frame Classes */
-typedef enum {
-   CLASS1_FRAME_TYPE  = 0x00,
-   CLASS2_FRAME_TYPE  = 0x01,
-   CLASS3_FRAME_TYPE  = 0x02,
-   FRAME_CLASS_FORCE_32BIT  = 0x
-} tenuFrameClass;
-
 /* Element ID  of various Information Elements */
 typedef enum {
ISSID   = 0,   /* Service Set Identifier */
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 2/2] staging: wilc1000: coreconfigurator.c: remove unused functions

[Tony Cho]

From: Glen Lee 

This patch removes following unused funtions which will not be used anymore.

ascii_hex_to_dec
get_hex_char
extract_mac_addr
create_mac_addr
conv_ip_to_int
conv_int_to_ip
get_wid_type
get_type
CreateConfigPacket
ConfigWaitResponse
ConfigProvideResponse
ConfigPktReceived
ParseWriteResponse
CreatePacketHeader
ParseResponse
ProcessBinWid
ProcessAdrWid
ProcessStrWid
ProcessIPwid
ProcessIntWid
ProcessShortWid
ProcessCharWid

As a result, four global variable causes defined but not used compile warnings.
So just remove unused varialbs g_seqno, g_wid_num, Res_Len and g_oper_mode.

Signed-off-by: Glen Lee 
Signed-off-by: Tony Cho 
---
 drivers/staging/wilc1000/coreconfigurator.c | 1051 ---
 1 file changed, 1051 deletions(-)

diff --git a/drivers/staging/wilc1000/coreconfigurator.c 
b/drivers/staging/wilc1000/coreconfigurator.c
index 450c3ff..f393424 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -163,14 +163,6 @@ static struct semaphore SemHandlePktResp;
 
 static tstrConfigPktInfo gstrConfigPktInfo;
 
-static u8 g_seqno;
-
-static s16 g_wid_num  = -1;
-
-static u16 Res_Len;
-
-static u8 g_oper_mode= SET_CFG;
-
 /* WID Switches */
 static tstrWID gastrWIDs[] = {
{WID_FIRMWARE_VERSION,  WID_STR},
@@ -307,160 +299,6 @@ u16 g_num_total_switches = (sizeof(gastrWIDs) / 
sizeof(tstrWID));
 /*/
 /* Functions */
 /*/
-INLINE u8 ascii_hex_to_dec(u8 num)
-{
-   if ((num >= '0') && (num <= '9'))
-   return (num - '0');
-   else if ((num >= 'A') && (num <= 'F'))
-   return (10 + (num - 'A'));
-   else if ((num >= 'a') && (num <= 'f'))
-   return (10 + (num - 'a'));
-
-   return INVALID;
-}
-
-INLINE u8 get_hex_char(u8 inp)
-{
-   u8 *d2htab = "0123456789ABCDEF";
-
-   return d2htab[inp & 0xF];
-}
-
-/* This function extracts the MAC address held in a string in standard format 
*/
-/* into another buffer as integers.   
*/
-INLINE u16 extract_mac_addr(char *str, u8 *buff)
-{
-   *buff = 0;
-   while (*str != '\0') {
-   if ((*str == ':') || (*str == '-'))
-   *(++buff) = 0;
-   else
-   *buff = (*buff << 4) + ascii_hex_to_dec(*str);
-
-   str++;
-   }
-
-   return MAC_ADDR_LEN;
-}
-
-/* This function creates MAC address in standard format from a buffer of  
*/
-/* integers.  
*/
-INLINE void create_mac_addr(u8 *str, u8 *buff)
-{
-   u32 i = 0;
-   u32 j = 0;
-
-   for (i = 0; i < MAC_ADDR_LEN; i++) {
-   str[j++] = get_hex_char((u8)((buff[i] >> 4) & 0x0F));
-   str[j++] = get_hex_char((u8)(buff[i] & 0x0F));
-   str[j++] = ':';
-   }
-   str[--j] = '\0';
-}
-
-/* This function converts the IP address string in dotted decimal format to */
-/* unsigned integer. This functionality is similar to the library function  */
-/* inet_addr() but is reimplemented here since I could not confirm that */
-/* inet_addr is platform independent.   */
-/* ips=>IP Address String in dotted decimal format  */
-/* ipn=>Pointer to IP Address in integer format */
-INLINE u8 conv_ip_to_int(u8 *ips, u32 *ipn)
-{
-   u8 i   = 0;
-   u8 ipb = 0;
-   *ipn = 0;
-   /* Integer to string for each component */
-   while (ips[i] != '\0') {
-   if (ips[i] == '.') {
-   *ipn = ((*ipn) << 8) | ipb;
-   ipb = 0;
-   } else {
-   ipb = ipb * 10 + ascii_hex_to_dec(ips[i]);
-   }
-
-   i++;
-   }
-
-   /* The last byte of the IP address is read in here */
-   *ipn = ((*ipn) << 8) | ipb;
-
-   return 0;
-}
-
-/* This function converts the IP address from integer format to dotted*/
-/* decimal string format. Alternative to std library fn inet_ntoa().  */
-/* ips=>Buffer to hold IP Address String dotted decimal format (Min 17B)  */
-/* ipn=>IP Address in integer format  */
-INLINE u8 conv_int_to_ip(u8 *ips, u32 ipn)
-{
-   u8 i   = 0;
-   u8 ipb = 0;
-   u8 cnt = 0;
-   u8 ipbsize = 0;
-
-   for (cnt = 4; cnt > 0; cnt--) {
-   ipb = (ipn >> (8 * (cnt - 1))) & 0xFF;
-
-   if (ipb >= 100)
-   ipbsize = 2;
-   else if (ipb >= 10)
-   ipbsize = 1;
-   else
-   

[PATCH 0/2] resending v2 of the patch for coreconfigurator.c file

[Tony Cho]

This is the version 2 for the series of the patch which removes unused
functions from the coreconfigurator.c file. Some of functions was not included
in the first patch.

Glen Lee (2):
  staging: wilc1000: remove unused enum
  staging: wilc1000: coreconfigurator.c: remove unused functions

 drivers/staging/wilc1000/coreconfigurator.c | 1059 ---
 1 file changed, 1059 deletions(-)

-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 02/31] staging: wilc1000: rename WILC_WFI_CfgScan

[Chaehyun Lim]

This patch replaces WILC_WFI_CfgScan with wilc_scan to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 3149fd8..8adc26a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -712,7 +712,7 @@ static int wilc_set_channel(struct wiphy *wiphy,
 }
 
 /**
- *  @brief  WILC_WFI_CfgScan
+ *  @brief  wilc_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 wilc_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 wilc_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 = wilc_set_channel,
-   .scan = WILC_WFI_CfgScan,
+   .scan = wilc_scan,
.connect = WILC_WFI_CfgConnect,
.disconnect = WILC_WFI_disconnect,
.add_key = WILC_WFI_add_key,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 09/31] staging: wilc1000: rename WILC_WFI_add_virt_intf

[Chaehyun Lim]

This patch replaces WILC_WFI_add_virt_intf with wilc_add_virt_intf to
avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 ca7a36f..01d6e4d 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  wilc_add_virt_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 *wilc_add_virt_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 = wilc_get_key,
.set_default_key = wilc_set_default_key,
#ifdef WILC_AP_EXTERNAL_MLME
-   .add_virtual_intf = WILC_WFI_add_virt_intf,
+   .add_virtual_intf = wilc_add_virt_intf,
.del_virtual_intf = WILC_WFI_del_virt_intf,
.change_virtual_intf = WILC_WFI_change_virt_intf,
 
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 03/31] staging: wilc1000: rename WILC_WFI_CfgConnect

[Chaehyun Lim]

This patch replaces WILC_WFI_CfgConnect with wilc_connect to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 8adc26a..0337a29 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -806,7 +806,7 @@ static int wilc_scan(struct wiphy *wiphy, struct 
cfg80211_scan_request *request)
 }
 
 /**
- *  @brief  WILC_WFI_CfgConnect
+ *  @brief  wilc_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 wilc_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 wilc_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 = wilc_set_channel,
.scan = wilc_scan,
-   .connect = WILC_WFI_CfgConnect,
+   .connect = wilc_connect,
.disconnect = WILC_WFI_disconnect,
.add_key = WILC_WFI_add_key,
.del_key = WILC_WFI_del_key,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 10/31] staging: wilc1000: rename WILC_WFI_del_virt_intf

[Chaehyun Lim]

This patch replaces WILC_WFI_del_virt_intf with wilc_del_virt_intf to
avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 01d6e4d..f014811 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3539,7 +3539,7 @@ struct wireless_dev *wilc_add_virt_intf(struct wiphy 
*wiphy, const char *name,
 }
 
 /**
- *  @brief  WILC_WFI_del_virt_intf
+ *  @brief  wilc_del_virt_intf
  *  @details
  *  @param[in]
  *  @return int : Return 0 on Success.
@@ -3547,7 +3547,7 @@ struct wireless_dev *wilc_add_virt_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 wilc_del_virt_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 = wilc_set_default_key,
#ifdef WILC_AP_EXTERNAL_MLME
.add_virtual_intf = wilc_add_virt_intf,
-   .del_virtual_intf = WILC_WFI_del_virt_intf,
+   .del_virtual_intf = wilc_del_virt_intf,
.change_virtual_intf = WILC_WFI_change_virt_intf,
 
.start_ap = WILC_WFI_start_ap,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 31/31] staging: wilc1000: rename WILC_WFI_set_cqm_rssi_config

[Chaehyun Lim]

This patch replaces WILC_WFI_set_cqm_rssi_config with
wilc_set_cqm_rssi_config to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 4967306..ec11f82 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2741,7 +2741,7 @@ void wilc_mgmt_frame_register(struct wiphy *wiphy,
 #endif /*WILC_P2P*/
 
 /**
- *  @brief  WILC_WFI_set_cqm_rssi_config
+ *  @brief  wilc_set_cqm_rssi_config
  *  @detailsConfigure connection quality monitor RSSI threshold.
  *  @param[in]   struct wiphy *wiphy:
  *  @param[in] struct net_device *dev:
@@ -2752,7 +2752,7 @@ void wilc_mgmt_frame_register(struct wiphy *wiphy,
  *  @date  01 MAR 2012
  *  @version   1.0
  */
-static intWILC_WFI_set_cqm_rssi_config(struct wiphy *wiphy,
+static intwilc_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");
@@ -3593,7 +3593,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
.mgmt_tx = wilc_mgmt_tx,
.mgmt_frame_register = wilc_mgmt_frame_register,
.set_power_mgmt = wilc_set_power_mgmt,
-   .set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
+   .set_cqm_rssi_config = wilc_set_cqm_rssi_config,
 #endif
 
 };
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [linuxwifi] iwlwifi: FW error in SYNC CMD MAC_CONTEXT_CMD

[Luca Coelho]

On Wed, 2015-09-09 at 16:09 +0200, Andreas Reis wrote:
> Hi,
> 
>  > seems that your system is trying to connect to two different APs 
> forth and back
> 
> Yes, this is a major network with multiple APs for each of its SSIDs 
> always available. Unlike my single AP home network, unsurprisingly.
> 
>  > whether you have more than wpa_supplicant instance running
> 
> I disabled wicd, invoked wpa_supplicant manually and checked with
> pidof, 
> there isn't. I also checked for changes with wpa_supplicant 2.3 vs
> git, 
> none.

Okay, there's probably something else.  Checking for two "competing"
instances of wpa_supplicant is low hanging fruit and the symptom is the
same you saw.


>  > was this working before you upgraded to iwlwifi-next 5bff6536f742
> 
> That's the weird part, IIRC it and the 16er firmware actually were 
> working fine *with* it (I had 4.2-RCs running with available 
> iwlwifi-next commits for weeks), which is why I was inclined to blame
> net.git until I found out that it currently doesn't work with the 
> vanilla Arch 4.2-3 kernel either. Honestly no idea why.
> 
> But I'll check with iwlwifi-next-for-kalle-2015-08-23 tomorrow.

Okay, please let us now if it makes any difference.


>  > directions in our debugging wiki page
> 
> Two remarks on that page:
> iwlfwdump.sh should probably get a note about chmod +x

Right, even though making scripts executable is a pretty standard
practice, people may forget it and then it's too late (i.e. the capture
was already lost).  I added a small comment to address that.



> trace-cmd is not part of standard kernel packages and thus should get
> a 
> note that it may need to be installed separately
> 
> > Since I wasn't aware of the latter, I'll only be able to post a
> > trace in 
> a bugzilla report tomorrow–

trace-cmd is not part of the kernel, it's just a userspace helper.  It
is pretty standard, though.  All major distros package it (including,
apparently, ArchLinux).


> – if that isn't bugged as well: "echo 1 > 
> /sys/kernel/debug/iwlwifi/\:02\:00.0/iwlmvm/fw_dbg_collect" 
> currently yields a "file exists", cat'ing it an invalid argument
> error, 
> "echo 1 >>" ostensibly works but shows in dmesg as (1), see
> "excerpts" 
> attachment.

That's weird.  This debugfs entry accepts anything as input... What
shell are you using? The (1) error seems to be totally unrelated.  I
think what happens is that the system is already stuck somehow, that's
why neither of the commands work.  Could you try the same command
cleanly (i.e. before you start experiencing any problems)? You should
see something like this in dmesg:

iwlwifi :02:00.0: Collecting data: trigger 1 fired.



> (2) shows an example of what wpa_supplicant currently prints. This 
> continues ad inf, and at some non-predictable point the driver
> bug(s?) 
> and/or FW reset appear in dmesg.

Hmmm... wpa_supplicant seems to be using WEXT which is deprecated and
certainly not as well maintained as the nl80211 API.  Could you try to
make sure that wpa_supplicant is using the nl80211 API instead? It
needs to be started with -Dnl80211 in the command line.


>  (3) shows two more variants I got with 
> net.git (now at 7845989) and Arch's 4.2-3 kernel.

There's some different stuff there... For some reason the system seems
to be quite unstable, probably the firmware is stuck or something.


> dmesg is also spammed with "r8169 :03:00.1 enp3s0f1: 
> rtl_counters_cond == 1 (loop: 1000, delay: 10).", but that's prob an 
> unrelated bug which has been there (but far) less frequent since
> early 4.2.

I don't think this has any relation with the wifi problems you're
having.


> As for net.git kernel config, "grep IWLWIFI":
> CONFIG_IWLWIFI=m
> CONFIG_IWLWIFI_LEDS=y
> CONFIG_IWLWIFI_OPMODE_MODULAR=y
> CONFIG_IWLWIFI_BCAST_FILTERING=y
> CONFIG_IWLWIFI_UAPSD=y
> CONFIG_IWLWIFI_DEBUG=y
> CONFIG_IWLWIFI_DEBUGFS=y
> # CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set
> CONFIG_IWLWIFI_DEVICE_TRACING=y

This looks fine.  Just out of curiosity, why are you using iwlwifi
-next.git? That is just a feeding tree for wireless-drivers-next.git. 
 It usually is prepared to send a pull request, but due to the merge
window (and to the temporary transition from Emmanuel to me as the
maintainer of that tree), the pull request is delayed.

To conclude, we don't really have much information here.  It will be
very helpful if you can provide trace-cmd logs and the firmware dump at
some point.

--
Luca.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 07/31] staging: wilc1000: rename WILC_WFI_get_key

[Chaehyun Lim]

This patch replaces WILC_WFI_get_key with wilc_get_key to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 ba5d790..8f90e48 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1511,7 +1511,7 @@ static int wilc_del_key(struct wiphy *wiphy, struct 
net_device *netdev,
 }
 
 /**
- *  @brief  WILC_WFI_get_key
+ *  @brief  wilc_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 wilc_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 wilc_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 = wilc_disconnect,
.add_key = wilc_add_key,
.del_key = wilc_del_key,
-   .get_key = WILC_WFI_get_key,
+   .get_key = wilc_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

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 08/31] staging: wilc1000: rename WILC_WFI_set_default_key

[Chaehyun Lim]

This patch replaces WILC_WFI_set_default_key with wilc_set_default_key
to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 8f90e48..ca7a36f 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1566,7 +1566,7 @@ static int wilc_get_key(struct wiphy *wiphy, struct 
net_device *netdev, u8 key_i
 }
 
 /**
- *  @brief  WILC_WFI_set_default_key
+ *  @brief  wilc_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 wilc_get_key(struct wiphy *wiphy, struct 
net_device *netdev, u8 key_i
  *  @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 wilc_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 = wilc_add_key,
.del_key = wilc_del_key,
.get_key = wilc_get_key,
-   .set_default_key = WILC_WFI_set_default_key,
+   .set_default_key = wilc_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

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 05/31] staging: wilc1000: rename WILC_WFI_add_key

[Chaehyun Lim]

This patch replaces WILC_WFI_add_key with wilc_add_key to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e301372..db327f7 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1112,7 +1112,7 @@ static int wilc_disconnect(struct wiphy *wiphy, struct 
net_device *dev, u16 reas
 }
 
 /**
- *  @brief  WILC_WFI_add_key
+ *  @brief  wilc_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 wilc_disconnect(struct wiphy *wiphy, struct 
net_device *dev, u16 reas
  *  @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 wilc_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,14 +2933,14 @@ 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,
+   
wilc_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 
*)(_key_ptk_params));
 
-   
WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+   
wilc_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,
@@ -3019,14 +3019,14 @@ 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,
+   
wilc_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 
*)(_key_ptk_params));
 
-   
WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+   
wilc_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,
@@ -3150,14 +3150,14 @@ static int WILC_WFI_change_virt_intf(struct wiphy 
*wiphy, struct net_device *dev
g_key_gtk_params.key[2],
g_key_gtk_params.cipher);
#if 1
-   
WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+   

[PATCH V2 23/31] staging: wilc1000: rename WILC_WFI_del_pmksa

[Chaehyun Lim]

This patch replaces WILC_WFI_del_pmksa with wilc_del_pmksa to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 3bac541..96c94e59 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1932,7 +1932,7 @@ static int wilc_set_pmksa(struct wiphy *wiphy, struct 
net_device *netdev,
 }
 
 /**
- *  @brief  WILC_WFI_del_pmksa
+ *  @brief  wilc_del_pmksa
  *  @detailsDelete a cached PMKID.
  *  @param[in]
  *  @return int : Return 0 on Success
@@ -1940,8 +1940,8 @@ static int wilc_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 wilc_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 = wilc_set_wiphy_params,
 
.set_pmksa = wilc_set_pmksa,
-   .del_pmksa = WILC_WFI_del_pmksa,
+   .del_pmksa = wilc_del_pmksa,
.flush_pmksa = WILC_WFI_flush_pmksa,
 #ifdef WILC_P2P
.remain_on_channel = WILC_WFI_remain_on_channel,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 25/31] staging: wilc1000: rename WILC_WFI_remain_on_channel

[Chaehyun Lim]

This patch replaces WILC_WFI_remain_on_channel with
wilc_remain_on_channel to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 c7cc1a2..824fba0 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  wilc_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  wilc_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 = wilc_del_pmksa,
.flush_pmksa = wilc_flush_pmksa,
 #ifdef WILC_P2P
-   .remain_on_channel = WILC_WFI_remain_on_channel,
+   .remain_on_channel = wilc_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

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 29/31] staging: wilc1000: rename WILC_WFI_frame_register

[Chaehyun Lim]

This patch replaces WILC_WFI_frame_register with
wilc_mgmt_frame_register to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 drivers/staging/wilc1000/linux_wlan.c |  8 
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c 
b/drivers/staging/wilc1000/linux_wlan.c
index 335335a..637f661 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1719,8 +1719,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 wilc_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)
@@ -1778,9 +1778,9 @@ int mac_open(struct net_device *ndev)
goto _err_;
}
 
-   WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, 
nic->wilc_netdev,
+   wilc_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);
-   WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, 
nic->wilc_netdev,
+   wilc_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++;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index dc935cb..2ecaeec 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2679,7 +2679,7 @@ int   wilc_mgmt_tx_cancel_wait(struct wiphy *wiphy,
 }
 
 /**
- *  @brief  WILC_WFI_frame_register
+ *  @brief  wilc_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   wilc_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 wilc_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 = wilc_cancel_remain_on_channel,
.mgmt_tx_cancel_wait = wilc_mgmt_tx_cancel_wait,
.mgmt_tx = wilc_mgmt_tx,
-   .mgmt_frame_register = WILC_WFI_frame_register,
+   .mgmt_frame_register = wilc_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

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 30/31] staging: wilc1000: rename WILC_WFI_set_power_mgmt

[Chaehyun Lim]

This patch replaces WILC_WFI_set_power_mgmt with wilc_set_power_mgmt to
avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 2ecaeec..4967306 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2794,7 +2794,7 @@ static int wilc_dump_station(struct wiphy *wiphy, struct 
net_device *dev,
 
 
 /**
- *  @brief  WILC_WFI_set_power_mgmt
+ *  @brief  wilc_set_power_mgmt
  *  @details
  *  @param[in]
  *  @return int : Return 0 on Success.
@@ -2802,8 +2802,8 @@ static int wilc_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 wilc_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 = wilc_mgmt_tx_cancel_wait,
.mgmt_tx = wilc_mgmt_tx,
.mgmt_frame_register = wilc_mgmt_frame_register,
-   .set_power_mgmt = WILC_WFI_set_power_mgmt,
+   .set_power_mgmt = wilc_set_power_mgmt,
.set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
 #endif
 
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 22/31] staging: wilc1000: rename WILC_WFI_set_pmksa

[Chaehyun Lim]

This patch replaces WILC_WFI_set_pmksa with wilc_set_pmksa to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 fb98534..3bac541 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  wilc_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 wilc_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 = wilc_change_bss,
.set_wiphy_params = wilc_set_wiphy_params,
 
-   .set_pmksa = WILC_WFI_set_pmksa,
+   .set_pmksa = wilc_set_pmksa,
.del_pmksa = WILC_WFI_del_pmksa,
.flush_pmksa = WILC_WFI_flush_pmksa,
 #ifdef WILC_P2P
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 21/31] staging: wilc1000: rename WILC_WFI_set_wiphy_params

[Chaehyun Lim]

This patch replaces WILC_WFI_set_wiphy_params with wilc_set_wiphy_params
to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 8a71027..fb98534 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  wilc_set_wiphy_params
  *  @detailsNotify that wiphy parameters have changed;
  *  @param[in]   Changed bitfield (see  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 wilc_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 = wilc_get_station,
.dump_station = wilc_dump_station,
.change_bss = wilc_change_bss,
-   .set_wiphy_params = WILC_WFI_set_wiphy_params,
+   .set_wiphy_params = wilc_set_wiphy_params,
 
.set_pmksa = WILC_WFI_set_pmksa,
.del_pmksa = WILC_WFI_del_pmksa,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 28/31] staging: wilc1000: rename WILC_WFI_mgmt_tx

[Chaehyun Lim]

This patch replaces WILC_WFI_mgmt_tx with wilc_mgmt_tx to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 8ce6721..dc935cb 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 wilc_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 = wilc_remain_on_channel,
.cancel_remain_on_channel = wilc_cancel_remain_on_channel,
.mgmt_tx_cancel_wait = wilc_mgmt_tx_cancel_wait,
-   .mgmt_tx = WILC_WFI_mgmt_tx,
+   .mgmt_tx = wilc_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

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 14/31] staging: wilc1000: rename WILC_WFI_stop_ap

[Chaehyun Lim]

This patch replaces WILC_WFI_stop_ap with wilc_stop_ap to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 69df5a0..1f21a83 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3278,7 +3278,7 @@ static int  wilc_change_beacon(struct wiphy *wiphy, 
struct net_device *dev,
 }
 
 /**
- *  @brief  WILC_WFI_stop_ap
+ *  @brief  wilc_stop_ap
  *  @detailsRemove beacon configuration and stop sending the beacon.
  *  @param[in]
  *  @return int : Return 0 on Success.
@@ -3286,7 +3286,7 @@ static int  wilc_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  wilc_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 = wilc_start_ap,
.change_beacon = wilc_change_beacon,
-   .stop_ap = WILC_WFI_stop_ap,
+   .stop_ap = wilc_stop_ap,
.add_station = WILC_WFI_add_station,
.del_station = WILC_WFI_del_station,
.change_station = WILC_WFI_change_station,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 16/31] staging: wilc1000: rename WILC_WFI_del_station

[Chaehyun Lim]

This patch replaces WILC_WFI_del_station with wilc_del_station to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 03dd87f..ff78497 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3384,7 +3384,7 @@ static int  wilc_add_station(struct wiphy *wiphy, struct 
net_device *dev,
 }
 
 /**
- *  @brief  WILC_WFI_del_station
+ *  @brief  wilc_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  wilc_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 wilc_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 = wilc_change_beacon,
.stop_ap = wilc_stop_ap,
.add_station = wilc_add_station,
-   .del_station = WILC_WFI_del_station,
+   .del_station = wilc_del_station,
.change_station = WILC_WFI_change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
.get_station = WILC_WFI_get_station,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 27/31] staging: wilc1000: rename WILC_WFI_mgmt_tx_cancel_wait

[Chaehyun Lim]

This patch replaces WILC_WFI_mgmt_tx_cancel_wait with
wilc_mgmt_tx_cancel_wait to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 6b84821..8ce6721 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   wilc_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 = wilc_remain_on_channel,
.cancel_remain_on_channel = wilc_cancel_remain_on_channel,
-   .mgmt_tx_cancel_wait = WILC_WFI_mgmt_tx_cancel_wait,
+   .mgmt_tx_cancel_wait = wilc_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

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 11/31] staging: wilc1000: rename WILC_WFI_change_virt_intf

[Chaehyun Lim]

This patch replaces WILC_WFI_change_virt_intf with
wilc_change_virt_intf to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 f014811..3c82f2a 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  wilc_change_virt_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 wilc_change_virt_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 = wilc_add_virt_intf,
.del_virtual_intf = wilc_del_virt_intf,
-   .change_virtual_intf = WILC_WFI_change_virt_intf,
+   .change_virtual_intf = wilc_change_virt_intf,
 
.start_ap = WILC_WFI_start_ap,
.change_beacon = WILC_WFI_change_beacon,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 15/31] staging: wilc1000: rename WILC_WFI_add_station

[Chaehyun Lim]

This patch replaces WILC_WFI_add_station with wilc_add_station to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 1f21a83..03dd87f 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3313,7 +3313,7 @@ static int  wilc_stop_ap(struct wiphy *wiphy, struct 
net_device *dev)
 }
 
 /**
- *  @brief  WILC_WFI_add_station
+ *  @brief  wilc_add_station
  *  @detailsAdd a new station.
  *  @param[in]
  *  @return int : Return 0 on Success.
@@ -3321,8 +3321,8 @@ static int  wilc_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  wilc_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 = wilc_start_ap,
.change_beacon = wilc_change_beacon,
.stop_ap = wilc_stop_ap,
-   .add_station = WILC_WFI_add_station,
+   .add_station = wilc_add_station,
.del_station = WILC_WFI_del_station,
.change_station = WILC_WFI_change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 17/31] staging: wilc1000: rename WILC_WFI_change_station

[Chaehyun Lim]

This patch replaces WILC_WFI_change_station with wilc_change_station to
avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 ff78497..76556a0 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3427,7 +3427,7 @@ static int wilc_del_station(struct wiphy *wiphy, struct 
net_device *dev,
 }
 
 /**
- *  @brief  WILC_WFI_change_station
+ *  @brief  wilc_change_station
  *  @detailsModify a given station.
  *  @param[in]
  *  @return int : Return 0 on Success.
@@ -3435,8 +3435,8 @@ static int wilc_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 wilc_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 = wilc_stop_ap,
.add_station = wilc_add_station,
.del_station = wilc_del_station,
-   .change_station = WILC_WFI_change_station,
+   .change_station = wilc_change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
.get_station = WILC_WFI_get_station,
.dump_station = WILC_WFI_dump_station,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 13/31] staging: wilc1000: remove WILC_WFI_change_beacon

[Chaehyun Lim]

This patch replaces WILC_WFI_change_beacon with wilc_change_beacon to
avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 eba2d56..69df5a0 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3247,7 +3247,7 @@ static int wilc_start_ap(struct wiphy *wiphy, struct 
net_device *dev,
 }
 
 /**
- *  @brief  WILC_WFI_change_beacon
+ *  @brief  wilc_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 wilc_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  wilc_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 = wilc_change_virt_intf,
 
.start_ap = wilc_start_ap,
-   .change_beacon = WILC_WFI_change_beacon,
+   .change_beacon = wilc_change_beacon,
.stop_ap = WILC_WFI_stop_ap,
.add_station = WILC_WFI_add_station,
.del_station = WILC_WFI_del_station,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 26/31] staging: wilc1000: rename WILC_WFI_cancel_remain_on_channel

[Chaehyun Lim]

This patch replaces WILC_WFI_cancel_remain_on_channel with
wilc_cancel_remain_on_channel to avoid CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 824fba0..6b84821 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2444,7 +2444,7 @@ static int  wilc_remain_on_channel(struct wiphy *wiphy,
 }
 
 /**
- *  @brief  WILC_WFI_cancel_remain_on_channel
+ *  @brief  wilc_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  wilc_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   wilc_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 = wilc_flush_pmksa,
 #ifdef WILC_P2P
.remain_on_channel = wilc_remain_on_channel,
-   .cancel_remain_on_channel = WILC_WFI_cancel_remain_on_channel,
+   .cancel_remain_on_channel = wilc_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

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 20/31] staging: wilc1000: rename WILC_WFI_change_bss

[Chaehyun Lim]

This patch replaces WILC_WFI_change_bss with wilc_change_bss to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 06276de..8a71027 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1710,7 +1710,7 @@ static int wilc_get_station(struct wiphy *wiphy, struct 
net_device *dev,
 
 
 /**
- *  @brief  WILC_WFI_change_bss
+ *  @brief  wilc_change_bss
  *  @detailsModify parameters for a given BSS.
  *  @param[in]
  *   -use_cts_prot: Whether to use CTS protection
@@ -1730,8 +1730,8 @@ static int wilc_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  wilc_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 = wilc_get_station,
.dump_station = wilc_dump_station,
-   .change_bss = WILC_WFI_change_bss,
+   .change_bss = wilc_change_bss,
.set_wiphy_params = WILC_WFI_set_wiphy_params,
 
.set_pmksa = WILC_WFI_set_pmksa,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 18/31] staging: wilc1000: rename WILC_WFI_get_station

[Chaehyun Lim]

This patch replaces WILC_WFI_get_station with wilc_get_station to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 76556a0..afacda5 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  wilc_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 wilc_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 = wilc_del_station,
.change_station = wilc_change_station,
#endif /* WILC_AP_EXTERNAL_MLME*/
-   .get_station = WILC_WFI_get_station,
+   .get_station = wilc_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

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2 12/31] staging: wilc1000: rename WILC_WFI_start_ap

[Chaehyun Lim]

This patch replaces WILC_WFI_start_ap with wilc_start_ap to avoid
CamelCase.

Signed-off-by: Chaehyun Lim 
---
V2: to make function name simple

 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 3c82f2a..eba2d56 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3206,7 +3206,7 @@ static int wilc_change_virt_intf(struct wiphy *wiphy, 
struct net_device *dev,
  */
 
 /**
- *  @brief  WILC_WFI_start_ap
+ *  @brief  wilc_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 wilc_change_virt_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 wilc_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 = wilc_del_virt_intf,
.change_virtual_intf = wilc_change_virt_intf,
 
-   .start_ap = WILC_WFI_start_ap,
+   .start_ap = wilc_start_ap,
.change_beacon = WILC_WFI_change_beacon,
.stop_ap = WILC_WFI_stop_ap,
.add_station = WILC_WFI_add_station,
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html