Skip to content

L
linux
Commit 297f06ce authored by Mithlesh Thukral's avatar Mithlesh Thukral Committed by Greg Kroah-Hartman
Browse files
Options

staging: wlan-ng: scripts/checkpatch.pl error fixes. 

scripts/checkpatch.pl error fixes. This is a TODO item.
This patch fixes most of the errors reported by checkpatch.pl in
wlan-ng directory of staging tree.
Signed-off-by: default avatarMithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0984e56a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 361 deletions
drivers/staging/wlan-ng/hfa384x_usb.c
View file @ 297f06ce
This diff is collapsed.
drivers/staging/wlan-ng/p80211conv.c
View file @ 297f06ce
......@@ -102,9 +102,9 @@ static u8 oui_8021h[] = { 0x00, 0x00, 0xf8 };
* Call context:
* May be called in interrupt or non-interrupt context
----------------------------------------------------------------*/
int skb_ether_to_p80211(wlandevice_t * wlandev, u32 ethconv,
struct sk_buff *skb, p80211_hdr_t * p80211_hdr,
p80211_metawep_t * p80211_wep)
int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,
struct sk_buff *skb, p80211_hdr_t *p80211_hdr,
p80211_metawep_t *p80211_wep)
{
u16 fc;
......@@ -230,8 +230,8 @@ int skb_ether_to_p80211(wlandevice_t * wlandev, u32 ethconv,
}
/* jkriegl: from orinoco, modified */
static void orinoco_spy_gather(wlandevice_t * wlandev, char *mac,
p80211_rxmeta_t * rxmeta)
static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,
p80211_rxmeta_t *rxmeta)
{
int i;
......@@ -272,7 +272,7 @@ static void orinoco_spy_gather(wlandevice_t * wlandev, char *mac,
* Call context:
* May be called in interrupt or non-interrupt context
----------------------------------------------------------------*/
int skb_p80211_to_ether(wlandevice_t * wlandev, u32 ethconv,
int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
struct sk_buff *skb)
{
netdevice_t *netdev = wlandev->netdev;
......
drivers/staging/wlan-ng/p80211netdev.c
View file @ 297f06ce
......@@ -94,18 +94,18 @@
static void p80211netdev_rx_bh(unsigned long arg);
/* netdevice method functions */
static int p80211knetdev_init(netdevice_t * netdev);
static struct net_device_stats *p80211knetdev_get_stats(netdevice_t * netdev);
static int p80211knetdev_open(netdevice_t * netdev);
static int p80211knetdev_stop(netdevice_t * netdev);
static int p80211knetdev_init(netdevice_t *netdev);
static struct net_device_stats *p80211knetdev_get_stats(netdevice_t *netdev);
static int p80211knetdev_open(netdevice_t *netdev);
static int p80211knetdev_stop(netdevice_t *netdev);
static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
netdevice_t * netdev);
static void p80211knetdev_set_multicast_list(netdevice_t * dev);
static int p80211knetdev_do_ioctl(netdevice_t * dev, struct ifreq *ifr,
netdevice_t *netdev);
static void p80211knetdev_set_multicast_list(netdevice_t *dev);
static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr,
int cmd);
static int p80211knetdev_set_mac_address(netdevice_t * dev, void *addr);
static void p80211knetdev_tx_timeout(netdevice_t * netdev);
static int p80211_rx_typedrop(wlandevice_t * wlandev, u16 fc);
static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr);
static void p80211knetdev_tx_timeout(netdevice_t *netdev);
static int p80211_rx_typedrop(wlandevice_t *wlandev, u16 fc);
int wlan_watchdog = 5000;
module_param(wlan_watchdog, int, 0644);
......@@ -127,7 +127,7 @@ MODULE_PARM_DESC(wlan_wext_write, "enable write wireless extensions");
* Returns:
* nothing
----------------------------------------------------------------*/
static int p80211knetdev_init(netdevice_t * netdev)
static int p80211knetdev_init(netdevice_t *netdev)
{
/* Called in response to register_netdev */
/* This is usually the probe function, but the probe has */
......@@ -174,7 +174,7 @@ static struct net_device_stats *p80211knetdev_get_stats(netdevice_t * netdev)
* Returns:
* zero on success, non-zero otherwise
----------------------------------------------------------------*/
static int p80211knetdev_open(netdevice_t * netdev)
static int p80211knetdev_open(netdevice_t *netdev)
{
int result = 0; /* success */
wlandevice_t *wlandev = netdev->ml_priv;
......@@ -209,7 +209,7 @@ static int p80211knetdev_open(netdevice_t * netdev)
* Returns:
* zero on success, non-zero otherwise
----------------------------------------------------------------*/
static int p80211knetdev_stop(netdevice_t * netdev)
static int p80211knetdev_stop(netdevice_t *netdev)
{
int result = 0;
wlandevice_t *wlandev = netdev->ml_priv;
......@@ -236,7 +236,7 @@ static int p80211knetdev_stop(netdevice_t * netdev)
* Side effects:
*
----------------------------------------------------------------*/
void p80211netdev_rx(wlandevice_t * wlandev, struct sk_buff *skb)
void p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb)
{
/* Enqueue for post-irq processing */
skb_queue_tail(&wlandev->nsd_rxq, skb);
......@@ -345,7 +345,7 @@ static void p80211netdev_rx_bh(unsigned long arg)
* zero on success, non-zero on failure.
----------------------------------------------------------------*/
static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
netdevice_t * netdev)
netdevice_t *netdev)
{
int result = 0;
int txresult = -1;
......@@ -472,7 +472,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
* Returns:
* nothing
----------------------------------------------------------------*/
static void p80211knetdev_set_multicast_list(netdevice_t * dev)
static void p80211knetdev_set_multicast_list(netdevice_t *dev)
{
wlandevice_t *wlandev = dev->ml_priv;
......@@ -485,7 +485,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t * dev)
#ifdef SIOCETHTOOL
static int p80211netdev_ethtool(wlandevice_t * wlandev, void __user * useraddr)
static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)
{
u32 ethcmd;
struct ethtool_drvinfo info;
......@@ -557,7 +557,7 @@ static int p80211netdev_ethtool(wlandevice_t * wlandev, void __user * useraddr)
* Process thread (ioctl caller). TODO: SMP support may require
* locks.
----------------------------------------------------------------*/
static int p80211knetdev_do_ioctl(netdevice_t * dev, struct ifreq *ifr, int cmd)
static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
{
int result = 0;
p80211ioctl_req_t *req = (p80211ioctl_req_t *) ifr;
......@@ -634,7 +634,7 @@ static int p80211knetdev_do_ioctl(netdevice_t * dev, struct ifreq *ifr, int cmd)
*
* by: Collin R. Mulliner <collin@mulliner.org>
----------------------------------------------------------------*/
static int p80211knetdev_set_mac_address(netdevice_t * dev, void *addr)
static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
{
struct sockaddr *new_addr = addr;
p80211msg_dot11req_mibset_t dot11req;
......@@ -694,7 +694,7 @@ static int p80211knetdev_set_mac_address(netdevice_t * dev, void *addr)
return result;
}
static int wlan_change_mtu(netdevice_t * dev, int new_mtu)
static int wlan_change_mtu(netdevice_t *dev, int new_mtu)
{
/* 2312 is max 802.11 payload, 20 is overhead, (ether + llc +snap)
and another 8 for wep. */
......@@ -742,7 +742,7 @@ static const struct net_device_ops p80211_netdev_ops = {
* compiled drivers, this function will be called in the
* context of the kernel startup code.
----------------------------------------------------------------*/
int wlan_setup(wlandevice_t * wlandev)
int wlan_setup(wlandevice_t *wlandev)
{
int result = 0;
netdevice_t *dev;
......@@ -800,7 +800,7 @@ int wlan_setup(wlandevice_t * wlandev)
* compiled drivers, this function will be called in the
* context of the kernel startup code.
----------------------------------------------------------------*/
int wlan_unsetup(wlandevice_t * wlandev)
int wlan_unsetup(wlandevice_t *wlandev)
{
int result = 0;
......@@ -836,7 +836,7 @@ int wlan_unsetup(wlandevice_t * wlandev)
* Call Context:
* Can be either interrupt or not.
----------------------------------------------------------------*/
int register_wlandev(wlandevice_t * wlandev)
int register_wlandev(wlandevice_t *wlandev)
{
int i = 0;
......@@ -864,7 +864,7 @@ int register_wlandev(wlandevice_t * wlandev)
* Call Context:
* Can be either interrupt or not.
----------------------------------------------------------------*/
int unregister_wlandev(wlandevice_t * wlandev)
int unregister_wlandev(wlandevice_t *wlandev)
{
struct sk_buff *skb;
......@@ -907,7 +907,7 @@ int unregister_wlandev(wlandevice_t * wlandev)
* Call context:
* Usually interrupt.
----------------------------------------------------------------*/
void p80211netdev_hwremoved(wlandevice_t * wlandev)
void p80211netdev_hwremoved(wlandevice_t *wlandev)
{
wlandev->hwremoved = 1;
if (wlandev->state == WLAN_DEVICE_OPEN)
......@@ -937,7 +937,7 @@ void p80211netdev_hwremoved(wlandevice_t * wlandev)
* Call context:
* interrupt
----------------------------------------------------------------*/
static int p80211_rx_typedrop(wlandevice_t * wlandev, u16 fc)
static int p80211_rx_typedrop(wlandevice_t *wlandev, u16 fc)
{
u16 ftype;
u16 fstype;
......@@ -1095,7 +1095,7 @@ static int p80211_rx_typedrop(wlandevice_t * wlandev, u16 fc)
return drop;
}
static void p80211knetdev_tx_timeout(netdevice_t * netdev)
static void p80211knetdev_tx_timeout(netdevice_t *netdev)
{
wlandevice_t *wlandev = netdev->ml_priv;
......
drivers/staging/wlan-ng/p80211req.c
View file @ 297f06ce
......@@ -73,9 +73,9 @@
#include "p80211metastruct.h"
#include "p80211req.h"
static void p80211req_handlemsg(wlandevice_t * wlandev, p80211msg_t * msg);
static int p80211req_mibset_mibget(wlandevice_t * wlandev,
p80211msg_dot11req_mibget_t * mib_msg,
static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg);
static int p80211req_mibset_mibget(wlandevice_t *wlandev,
p80211msg_dot11req_mibget_t *mib_msg,
int isget);
/*----------------------------------------------------------------
......@@ -150,7 +150,7 @@ int p80211req_dorequest(wlandevice_t * wlandev, u8 * msgbuf)
* Call context:
* Process thread
----------------------------------------------------------------*/
static void p80211req_handlemsg(wlandevice_t * wlandev, p80211msg_t * msg)
static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg)
{
switch (msg->msgcode) {
......@@ -180,8 +180,8 @@ static void p80211req_handlemsg(wlandevice_t * wlandev, p80211msg_t * msg)
return;
}
static int p80211req_mibset_mibget(wlandevice_t * wlandev,
p80211msg_dot11req_mibget_t * mib_msg,
static int p80211req_mibset_mibget(wlandevice_t *wlandev,
p80211msg_dot11req_mibget_t *mib_msg,
int isget)
{
p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data;
......
drivers/staging/wlan-ng/p80211wep.c
View file @ 297f06ce
......@@ -54,7 +54,7 @@
#include <linux/random.h>
#include <linux/kernel.h>
// #define WEP_DEBUG
/* #define WEP_DEBUG */
/*================================================================*/
/* Project Includes */
......@@ -136,7 +136,7 @@ static const u32 wep_crc32_table[256] = {
/* keylen in bytes! */
int wep_change_key(wlandevice_t * wlandev, int keynum, u8 * key, int keylen)
int wep_change_key(wlandevice_t *wlandev, int keynum, u8 *key, int keylen)
{
if (keylen < 0)
return -1;
......@@ -166,8 +166,8 @@ int wep_change_key(wlandevice_t * wlandev, int keynum, u8 * key, int keylen)
4-byte IV at start of buffer, 4-byte ICV at end of buffer.
if successful, buf start is payload begin, length -= 8;
*/
int wep_decrypt(wlandevice_t * wlandev, u8 * buf, u32 len, int key_override,
u8 * iv, u8 * icv)
int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override,
u8 *iv, u8 *icv)
{
u32 i, j, k, crc, keylen;
u8 s[256], key[64], c_crc[4];
......@@ -245,8 +245,8 @@ int wep_decrypt(wlandevice_t * wlandev, u8 * buf, u32 len, int key_override,
}
/* encrypts in-place. */
int wep_encrypt(wlandevice_t * wlandev, u8 * buf, u8 * dst, u32 len, int keynum,
u8 * iv, u8 * icv)
int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum,
u8 *iv, u8 *icv)
{
u32 i, j, k, crc, keylen;
u8 s[256], key[64];
......
drivers/staging/wlan-ng/p80211wext.c
View file @ 297f06ce
......@@ -66,10 +66,10 @@
#include "p80211ioctl.h"
#include "p80211req.h"
static int p80211wext_giwrate(netdevice_t * dev,
static int p80211wext_giwrate(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra);
static int p80211wext_giwessid(netdevice_t * dev,
static int p80211wext_giwessid(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *data, char *essid);
......@@ -130,7 +130,7 @@ static int qual_as_percent(int snr)
return 100;
}
static int p80211wext_dorequest(wlandevice_t * wlandev, u32 did, u32 data)
static int p80211wext_dorequest(wlandevice_t *wlandev, u32 did, u32 data)
{
p80211msg_dot11req_mibset_t msg;
p80211item_uint32_t mibitem;
......@@ -145,7 +145,7 @@ static int p80211wext_dorequest(wlandevice_t * wlandev, u32 did, u32 data)
return result;
}
static int p80211wext_autojoin(wlandevice_t * wlandev)
static int p80211wext_autojoin(wlandevice_t *wlandev)
{
p80211msg_lnxreq_autojoin_t msg;
struct iw_point data;
......@@ -191,7 +191,7 @@ static int p80211wext_autojoin(wlandevice_t * wlandev)
}
/* called by /proc/net/wireless */
struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev)
struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t *dev)
{
p80211msg_lnxreq_commsquality_t quality;
wlandevice_t *wlandev = dev->ml_priv;
......@@ -232,7 +232,7 @@ struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev)
return wstats;
}
static int p80211wext_giwname(netdevice_t * dev,
static int p80211wext_giwname(netdevice_t *dev,
struct iw_request_info *info,
char *name, char *extra)
{
......@@ -261,7 +261,7 @@ static int p80211wext_giwname(netdevice_t * dev,
return err;
}
static int p80211wext_giwfreq(netdevice_t * dev,
static int p80211wext_giwfreq(netdevice_t *dev,
struct iw_request_info *info,
struct iw_freq *freq, char *extra)
{
......@@ -296,7 +296,7 @@ static int p80211wext_giwfreq(netdevice_t * dev,
return err;
}
static int p80211wext_siwfreq(netdevice_t * dev,
static int p80211wext_siwfreq(netdevice_t *dev,
struct iw_request_info *info,
struct iw_freq *freq, char *extra)
{
......@@ -332,9 +332,9 @@ static int p80211wext_siwfreq(netdevice_t * dev,
return err;
}
static int p80211wext_giwmode(netdevice_t * dev,
static int p80211wext_giwmode(netdevice_t *dev,
struct iw_request_info *info,
__u32 * mode, char *extra)
__u32 *mode, char *extra)
{
wlandevice_t *wlandev = dev->ml_priv;
......@@ -356,9 +356,9 @@ static int p80211wext_giwmode(netdevice_t * dev,
return 0;
}
static int p80211wext_siwmode(netdevice_t * dev,
static int p80211wext_siwmode(netdevice_t *dev,
struct iw_request_info *info,
__u32 * mode, char *extra)
__u32 *mode, char *extra)
{
wlandevice_t *wlandev = dev->ml_priv;
p80211item_uint32_t mibitem;
......@@ -411,7 +411,7 @@ static int p80211wext_siwmode(netdevice_t * dev,
return err;
}
static int p80211wext_giwrange(netdevice_t * dev,
static int p80211wext_giwrange(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
......@@ -480,7 +480,7 @@ static int p80211wext_giwrange(netdevice_t * dev,
return 0;
}
static int p80211wext_giwap(netdevice_t * dev,
static int p80211wext_giwap(netdevice_t *dev,
struct iw_request_info *info,
struct sockaddr *ap_addr, char *extra)
{
......@@ -493,7 +493,7 @@ static int p80211wext_giwap(netdevice_t * dev,
return 0;
}
static int p80211wext_giwencode(netdevice_t * dev,
static int p80211wext_giwencode(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *erq, char *key)
{
......@@ -534,7 +534,7 @@ static int p80211wext_giwencode(netdevice_t * dev,
return err;
}
static int p80211wext_siwencode(netdevice_t * dev,
static int p80211wext_siwencode(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *erq, char *key)
{
......@@ -681,7 +681,7 @@ static int p80211wext_siwencode(netdevice_t * dev,
return err;
}
static int p80211wext_giwessid(netdevice_t * dev,
static int p80211wext_giwessid(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *data, char *essid)
{
......@@ -704,7 +704,7 @@ static int p80211wext_giwessid(netdevice_t * dev,
return 0;
}
static int p80211wext_siwessid(netdevice_t * dev,
static int p80211wext_siwessid(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *data, char *essid)
{
......@@ -752,7 +752,7 @@ static int p80211wext_siwessid(netdevice_t * dev,
return err;
}
static int p80211wext_siwcommit(netdevice_t * dev,
static int p80211wext_siwcommit(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *data, char *essid)
{
......@@ -771,7 +771,7 @@ static int p80211wext_siwcommit(netdevice_t * dev,
return err;
}
static int p80211wext_giwrate(netdevice_t * dev,
static int p80211wext_giwrate(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
......@@ -822,7 +822,7 @@ static int p80211wext_giwrate(netdevice_t * dev,
return err;
}
static int p80211wext_giwrts(netdevice_t * dev,
static int p80211wext_giwrts(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *rts, char *extra)
{
......@@ -852,7 +852,7 @@ static int p80211wext_giwrts(netdevice_t * dev,
return err;
}
static int p80211wext_siwrts(netdevice_t * dev,
static int p80211wext_siwrts(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *rts, char *extra)
{
......@@ -886,7 +886,7 @@ static int p80211wext_siwrts(netdevice_t * dev,
return err;
}
static int p80211wext_giwfrag(netdevice_t * dev,
static int p80211wext_giwfrag(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *frag, char *extra)
{
......@@ -917,7 +917,7 @@ static int p80211wext_giwfrag(netdevice_t * dev,
return err;
}
static int p80211wext_siwfrag(netdevice_t * dev,
static int p80211wext_siwfrag(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *frag, char *extra)
{
......@@ -961,7 +961,7 @@ static int p80211wext_siwfrag(netdevice_t * dev,
#define IW_RETRY_SHORT IW_RETRY_MIN
#endif
static int p80211wext_giwretry(netdevice_t * dev,
static int p80211wext_giwretry(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
......@@ -1038,7 +1038,7 @@ static int p80211wext_giwretry(netdevice_t * dev,
}
static int p80211wext_siwretry(netdevice_t * dev,
static int p80211wext_siwretry(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
......@@ -1109,7 +1109,7 @@ static int p80211wext_siwretry(netdevice_t * dev,
}
static int p80211wext_siwtxpow(netdevice_t * dev,
static int p80211wext_siwtxpow(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
......@@ -1143,7 +1143,7 @@ static int p80211wext_siwtxpow(netdevice_t * dev,
return err;
}
static int p80211wext_giwtxpow(netdevice_t * dev,
static int p80211wext_giwtxpow(netdevice_t *dev,
struct iw_request_info *info,
struct iw_param *rrq, char *extra)
{
......@@ -1178,7 +1178,7 @@ static int p80211wext_giwtxpow(netdevice_t * dev,
return err;
}
static int p80211wext_siwspy(netdevice_t * dev,
static int p80211wext_siwspy(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *srq, char *extra)
{
......@@ -1213,7 +1213,7 @@ static int p80211wext_siwspy(netdevice_t * dev,
}
/* jkriegl: from orinoco, modified */
static int p80211wext_giwspy(netdevice_t * dev,
static int p80211wext_giwspy(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *srq, char *extra)
{
......@@ -1273,7 +1273,7 @@ static int prism2_result2err(int prism2_result)
return err;
}
static int p80211wext_siwscan(netdevice_t * dev,
static int p80211wext_siwscan(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *srq, char *extra)
{
......@@ -1320,7 +1320,7 @@ static int p80211wext_siwscan(netdevice_t * dev,
*/
static char *wext_translate_bss(struct iw_request_info *info, char *current_ev,
char *end_buf,
p80211msg_dot11req_scan_results_t * bss)
p80211msg_dot11req_scan_results_t *bss)
{
struct iw_event iwe; /* Temporary buffer */
......@@ -1404,7 +1404,7 @@ static char *wext_translate_bss(struct iw_request_info *info, char *current_ev,
return current_ev;
}
static int p80211wext_giwscan(netdevice_t * dev,
static int p80211wext_giwscan(netdevice_t *dev,
struct iw_request_info *info,
struct iw_point *srq, char *extra)
{
......
drivers/staging/wlan-ng/prism2fw.c
View file @ 297f06ce
......@@ -177,19 +177,19 @@ typedef struct imgchunk {
/* s-record image processing */
/* Data records */
unsigned int ns3data = 0;
unsigned int ns3data;
s3datarec_t s3data[S3DATA_MAX];
/* Plug records */
unsigned int ns3plug = 0;
unsigned int ns3plug;
s3plugrec_t s3plug[S3PLUG_MAX];
/* CRC records */
unsigned int ns3crc = 0;
unsigned int ns3crc;
s3crcrec_t s3crc[S3CRC_MAX];
/* Info records */
unsigned int ns3info = 0;
unsigned int ns3info;
s3inforec_t s3info[S3INFO_MAX];
/* S7 record (there _better_ be only one) */
......@@ -216,17 +216,17 @@ hfa384x_caplevel_t priid;
int prism2_fwapply(char *rfptr, int rfsize, wlandevice_t * wlandev);
int read_srecfile(char *rfptr, int rfsize);
int mkimage(imgchunk_t * clist, unsigned int *ccnt);
int read_cardpda(pda_t * pda, wlandevice_t * wlandev);
int mkpdrlist(pda_t * pda);
int mkimage(imgchunk_t *clist, unsigned int *ccnt);
int read_cardpda(pda_t *pda, wlandevice_t *wlandev);
int mkpdrlist(pda_t *pda);
int s3datarec_compare(const void *p1, const void *p2);
int plugimage(imgchunk_t * fchunk, unsigned int nfchunks,
s3plugrec_t * s3plug, unsigned int ns3plug, pda_t * pda);
int crcimage(imgchunk_t * fchunk, unsigned int nfchunks,
s3crcrec_t * s3crc, unsigned int ns3crc);
int writeimage(wlandevice_t * wlandev, imgchunk_t * fchunk,
int plugimage(imgchunk_t *fchunk, unsigned int nfchunks,
s3plugrec_t *s3plug, unsigned int ns3plug, pda_t * pda);
int crcimage(imgchunk_t *fchunk, unsigned int nfchunks,
s3crcrec_t *s3crc, unsigned int ns3crc);
int writeimage(wlandevice_t *wlandev, imgchunk_t *fchunk,
unsigned int nfchunks);
void free_chunks(imgchunk_t * fchunk, unsigned int *nfchunks);
void free_chunks(imgchunk_t *fchunk, unsigned int *nfchunks);
void free_srecs(void);
int validate_identity(void);
......@@ -247,7 +247,7 @@ int validate_identity(void);
* 0 - success
* ~0 - failure
----------------------------------------------------------------*/
int prism2_fwtry(struct usb_device *udev, wlandevice_t * wlandev)
int prism2_fwtry(struct usb_device *udev, wlandevice_t *wlandev)
{
const struct firmware *fw_entry = NULL;
......@@ -283,7 +283,7 @@ int prism2_fwtry(struct usb_device *udev, wlandevice_t * wlandev)
* 0 - success
* ~0 - failure
----------------------------------------------------------------*/
int prism2_fwapply(char *rfptr, int rfsize, wlandevice_t * wlandev)
int prism2_fwapply(char *rfptr, int rfsize, wlandevice_t *wlandev)
{
signed int result = 0;
p80211msg_dot11req_mibget_t getmsg;
......@@ -425,7 +425,7 @@ int prism2_fwapply(char *rfptr, int rfsize, wlandevice_t * wlandev)
* 0 success
* ~0 failure
----------------------------------------------------------------*/
int crcimage(imgchunk_t * fchunk, unsigned int nfchunks, s3crcrec_t * s3crc,
int crcimage(imgchunk_t *fchunk, unsigned int nfchunks, s3crcrec_t *s3crc,
unsigned int ns3crc)
{
int result = 0;
......@@ -490,7 +490,7 @@ int crcimage(imgchunk_t * fchunk, unsigned int nfchunks, s3crcrec_t * s3crc,
* Returns:
* nothing
----------------------------------------------------------------*/
void free_chunks(imgchunk_t * fchunk, unsigned int *nfchunks)
void free_chunks(imgchunk_t *fchunk, unsigned int *nfchunks)
{
int i;
for (i = 0; i < *nfchunks; i++) {
......@@ -545,7 +545,7 @@ void free_srecs(void)
* 0 - success
* ~0 - failure (probably an errno)
----------------------------------------------------------------*/
int mkimage(imgchunk_t * clist, unsigned int *ccnt)
int mkimage(imgchunk_t *clist, unsigned int *ccnt)
{
int result = 0;
int i;
......@@ -644,7 +644,7 @@ int mkimage(imgchunk_t * clist, unsigned int *ccnt)
* 0 - success
* ~0 - failure (probably an errno)
----------------------------------------------------------------*/
int mkpdrlist(pda_t * pda)
int mkpdrlist(pda_t *pda)
{
int result = 0;
u16 *pda16 = (u16 *) pda->buf;
......@@ -717,8 +717,8 @@ int mkpdrlist(pda_t * pda)
* 0 success
* ~0 failure
----------------------------------------------------------------*/
int plugimage(imgchunk_t * fchunk, unsigned int nfchunks,
s3plugrec_t * s3plug, unsigned int ns3plug, pda_t * pda)
int plugimage(imgchunk_t *fchunk, unsigned int nfchunks,
s3plugrec_t *s3plug, unsigned int ns3plug, pda_t * pda)
{
int result = 0;
int i; /* plug index */
......@@ -825,7 +825,7 @@ int plugimage(imgchunk_t * fchunk, unsigned int nfchunks,
* 0 - success
* ~0 - failure (probably an errno)
----------------------------------------------------------------*/
int read_cardpda(pda_t * pda, wlandevice_t * wlandev)
int read_cardpda(pda_t *pda, wlandevice_t *wlandev)
{
int result = 0;
p80211msg_p2req_readpda_t msg;
......@@ -1175,7 +1175,7 @@ int s3datarec_compare(const void *p1, const void *p2)
* 0 success
* ~0 failure
----------------------------------------------------------------*/
int writeimage(wlandevice_t * wlandev, imgchunk_t * fchunk,
int writeimage(wlandevice_t *wlandev, imgchunk_t *fchunk,
unsigned int nfchunks)
{
int result = 0;
......
drivers/staging/wlan-ng/prism2mgmt.c
View file @ 297f06ce
......@@ -117,7 +117,7 @@
* process thread (usually)
* interrupt
----------------------------------------------------------------*/
int prism2mgmt_scan(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
{
int result = 0;
hfa384x_t *hw = wlandev->priv;
......@@ -362,7 +362,7 @@ int prism2mgmt_scan(wlandevice_t * wlandev, void *msgp)
* process thread (usually)
* interrupt
----------------------------------------------------------------*/
int prism2mgmt_scan_results(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
{
int result = 0;
p80211msg_dot11req_scan_results_t *req;
......@@ -511,7 +511,7 @@ int prism2mgmt_scan_results(wlandevice_t * wlandev, void *msgp)
* process thread (usually)
* interrupt
----------------------------------------------------------------*/
int prism2mgmt_start(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
{
int result = 0;
hfa384x_t *hw = wlandev->priv;
......@@ -688,7 +688,7 @@ int prism2mgmt_start(wlandevice_t * wlandev, void *msgp)
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_readpda(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_readpda_t *msg = msgp;
......@@ -754,7 +754,7 @@ int prism2mgmt_readpda(wlandevice_t * wlandev, void *msgp)
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_ramdl_state(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_ramdl_state_t *msg = msgp;
......@@ -810,7 +810,7 @@ int prism2mgmt_ramdl_state(wlandevice_t * wlandev, void *msgp)
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_ramdl_write(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_ramdl_write_t *msg = msgp;
......@@ -872,7 +872,7 @@ int prism2mgmt_ramdl_write(wlandevice_t * wlandev, void *msgp)
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_flashdl_state(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
{
int result = 0;
hfa384x_t *hw = wlandev->priv;
......@@ -943,7 +943,7 @@ int prism2mgmt_flashdl_state(wlandevice_t * wlandev, void *msgp)
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_flashdl_write(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_flashdl_write_t *msg = msgp;
......@@ -1004,7 +1004,7 @@ int prism2mgmt_flashdl_write(wlandevice_t * wlandev, void *msgp)
* process thread (usually)
* interrupt
----------------------------------------------------------------*/
int prism2mgmt_autojoin(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
int result = 0;
......@@ -1075,7 +1075,7 @@ int prism2mgmt_autojoin(wlandevice_t * wlandev, void *msgp)
* process thread (usually)
* interrupt
----------------------------------------------------------------*/
int prism2mgmt_wlansniff(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
{
int result = 0;
p80211msg_lnxreq_wlansniff_t *msg = msgp;
......
drivers/staging/wlan-ng/prism2mib.c
View file @ 297f06ce
......@@ -86,65 +86,65 @@ typedef struct mibrec {
u16 parm1;
u16 parm2;
u16 parm3;
int (*func) (struct mibrec * mib,
int (*func) (struct mibrec *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg, void *data);
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data);
} mibrec_t;
static int prism2mib_bytearea2pstr(mibrec_t * mib,
static int prism2mib_bytearea2pstr(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
static int prism2mib_uint32(mibrec_t * mib,
static int prism2mib_uint32(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg, void *data);
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data);
static int prism2mib_flag(mibrec_t * mib,
static int prism2mib_flag(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg, void *data);
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data);
static int prism2mib_wepdefaultkey(mibrec_t * mib,
static int prism2mib_wepdefaultkey(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
static int prism2mib_privacyinvoked(mibrec_t * mib,
static int prism2mib_privacyinvoked(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
static int prism2mib_excludeunencrypted(mibrec_t * mib,
static int prism2mib_excludeunencrypted(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
static int prism2mib_fragmentationthreshold(mibrec_t * mib,
static int prism2mib_fragmentationthreshold(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
static int prism2mib_priv(mibrec_t * mib,
static int prism2mib_priv(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg, void *data);
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data);
static mibrec_t mibtab[] = {
......@@ -258,7 +258,7 @@ static mibrec_t mibtab[] = {
* interrupt
----------------------------------------------------------------*/
int prism2mgmt_mibset_mibget(wlandevice_t * wlandev, void *msgp)
int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
int result, isget;
......@@ -372,11 +372,11 @@ int prism2mgmt_mibset_mibget(wlandevice_t * wlandev, void *msgp)
*
----------------------------------------------------------------*/
static int prism2mib_bytearea2pstr(mibrec_t * mib,
static int prism2mib_bytearea2pstr(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
......@@ -422,11 +422,11 @@ static int prism2mib_bytearea2pstr(mibrec_t * mib,
*
----------------------------------------------------------------*/
static int prism2mib_uint32(mibrec_t * mib,
static int prism2mib_uint32(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg, void *data)
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data)
{
int result;
u32 *uint32 = (u32 *) data;
......@@ -469,11 +469,11 @@ static int prism2mib_uint32(mibrec_t * mib,
*
----------------------------------------------------------------*/
static int prism2mib_flag(mibrec_t * mib,
static int prism2mib_flag(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg, void *data)
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data)
{
int result;
u32 *uint32 = (u32 *) data;
......@@ -526,11 +526,11 @@ static int prism2mib_flag(mibrec_t * mib,
*
----------------------------------------------------------------*/
static int prism2mib_wepdefaultkey(mibrec_t * mib,
static int prism2mib_wepdefaultkey(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
......@@ -576,11 +576,11 @@ static int prism2mib_wepdefaultkey(mibrec_t * mib,
*
----------------------------------------------------------------*/
static int prism2mib_privacyinvoked(mibrec_t * mib,
static int prism2mib_privacyinvoked(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
......@@ -622,11 +622,11 @@ static int prism2mib_privacyinvoked(mibrec_t * mib,
*
----------------------------------------------------------------*/
static int prism2mib_excludeunencrypted(mibrec_t * mib,
static int prism2mib_excludeunencrypted(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
......@@ -661,11 +661,11 @@ static int prism2mib_excludeunencrypted(mibrec_t * mib,
*
----------------------------------------------------------------*/
static int prism2mib_fragmentationthreshold(mibrec_t * mib,
static int prism2mib_fragmentationthreshold(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
......@@ -710,11 +710,11 @@ static int prism2mib_fragmentationthreshold(mibrec_t * mib,
*
----------------------------------------------------------------*/
static int prism2mib_priv(mibrec_t * mib,
static int prism2mib_priv(mibrec_t *mib,
int isget,
wlandevice_t * wlandev,
hfa384x_t * hw,
p80211msg_dot11req_mibset_t * msg, void *data)
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data)
{
p80211pstrd_t *pstr = (p80211pstrd_t *) data;
......@@ -764,7 +764,7 @@ static int prism2mib_priv(mibrec_t * mib,
*
----------------------------------------------------------------*/
void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t * bytestr, p80211pstrd_t * pstr)
void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
{
bytestr->len = cpu_to_le16((u16) (pstr->len));
memcpy(bytestr->data, pstr->data, pstr->len);
......@@ -785,7 +785,7 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t * bytestr, p80211pstrd_t * pstr)
*
----------------------------------------------------------------*/
void prism2mgmt_pstr2bytearea(u8 * bytearea, p80211pstrd_t * pstr)
void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
{
memcpy(bytearea, pstr->data, pstr->len);
}
......@@ -805,7 +805,7 @@ void prism2mgmt_pstr2bytearea(u8 * bytearea, p80211pstrd_t * pstr)
*
----------------------------------------------------------------*/
void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t * bytestr, p80211pstrd_t * pstr)
void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
{
pstr->len = (u8) (le16_to_cpu((u16) (bytestr->len)));
memcpy(pstr->data, bytestr->data, pstr->len);
......@@ -826,7 +826,7 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t * bytestr, p80211pstrd_t * pstr)
*
----------------------------------------------------------------*/
void prism2mgmt_bytearea2pstr(u8 * bytearea, p80211pstrd_t * pstr, int len)
void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len)
{
pstr->len = (u8) len;
memcpy(pstr->data, bytearea, len);
......
drivers/staging/wlan-ng/prism2sta.c
View file @ 297f06ce
This diff is collapsed.
drivers/staging/wlan-ng/prism2usb.c
View file @ 297f06ce
......@@ -4,9 +4,9 @@
#include "prism2sta.c"
#include "prism2fw.c"
#define PRISM_USB_DEVICE(vid, pid, name) \
USB_DEVICE(vid, pid), \
.driver_info = (unsigned long) name
#define PRISM_USB_DEVICE(vid, pid, name) \
USB_DEVICE(vid, pid), \
.driver_info = (unsigned long) name
static struct usb_device_id usb_prism_tbl[] = {
{PRISM_USB_DEVICE(0x04bb, 0x0922, "IOData AirPort WN-B11/USBS")},
......@@ -111,8 +111,8 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
int result = 0;
dev = interface_to_usbdev(interface);
if ((wlandev = create_wlan()) == NULL) {
wlandev = create_wlan();
if (wlandev == NULL) {
printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info);
result = -EIO;
goto failed;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7