Commit 3056c404 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: address checkpatch typedef warning



Just sprinkle the necessary structs around...
Signed-off-by: default avatarDavid Kilroy <kilroyd@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6eecad77
...@@ -279,7 +279,8 @@ static int orinoco_bss_data_allocate(struct orinoco_private *priv) ...@@ -279,7 +279,8 @@ static int orinoco_bss_data_allocate(struct orinoco_private *priv)
return 0; return 0;
priv->bss_data = priv->bss_data =
kzalloc(ORINOCO_MAX_BSS_COUNT * sizeof(bss_element), GFP_KERNEL); kzalloc(ORINOCO_MAX_BSS_COUNT * sizeof(struct bss_element),
GFP_KERNEL);
if (!priv->bss_data) { if (!priv->bss_data) {
printk(KERN_WARNING "Out of memory allocating beacons"); printk(KERN_WARNING "Out of memory allocating beacons");
return -ENOMEM; return -ENOMEM;
...@@ -1413,8 +1414,8 @@ static void orinoco_send_wevents(struct work_struct *work) ...@@ -1413,8 +1414,8 @@ static void orinoco_send_wevents(struct work_struct *work)
static inline void orinoco_clear_scan_results(struct orinoco_private *priv, static inline void orinoco_clear_scan_results(struct orinoco_private *priv,
unsigned long scan_age) unsigned long scan_age)
{ {
bss_element *bss; struct bss_element *bss;
bss_element *tmp_bss; struct bss_element *tmp_bss;
/* Blow away current list of scan results */ /* Blow away current list of scan results */
list_for_each_entry_safe(bss, tmp_bss, &priv->bss_list, list) { list_for_each_entry_safe(bss, tmp_bss, &priv->bss_list, list) {
...@@ -1489,7 +1490,7 @@ static int orinoco_process_scan_results(struct net_device *dev, ...@@ -1489,7 +1490,7 @@ static int orinoco_process_scan_results(struct net_device *dev,
/* Read the entries one by one */ /* Read the entries one by one */
for (; offset + atom_len <= len; offset += atom_len) { for (; offset + atom_len <= len; offset += atom_len) {
int found = 0; int found = 0;
bss_element *bss = NULL; struct bss_element *bss = NULL;
/* Get next atom */ /* Get next atom */
atom = (union hermes_scan_info *) (buf + offset); atom = (union hermes_scan_info *) (buf + offset);
...@@ -1511,7 +1512,7 @@ static int orinoco_process_scan_results(struct net_device *dev, ...@@ -1511,7 +1512,7 @@ static int orinoco_process_scan_results(struct net_device *dev,
/* Grab a bss off the free list */ /* Grab a bss off the free list */
if (!found && !list_empty(&priv->bss_free_list)) { if (!found && !list_empty(&priv->bss_free_list)) {
bss = list_entry(priv->bss_free_list.next, bss = list_entry(priv->bss_free_list.next,
bss_element, list); struct bss_element, list);
list_del(priv->bss_free_list.next); list_del(priv->bss_free_list.next);
list_add_tail(&bss->list, &priv->bss_list); list_add_tail(&bss->list, &priv->bss_list);
...@@ -4547,7 +4548,7 @@ static int orinoco_ioctl_getscan(struct net_device *dev, ...@@ -4547,7 +4548,7 @@ static int orinoco_ioctl_getscan(struct net_device *dev,
char *extra) char *extra)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
bss_element *bss; struct bss_element *bss;
int err = 0; int err = 0;
unsigned long flags; unsigned long flags;
char *current_ev = extra; char *current_ev = extra;
......
...@@ -36,11 +36,11 @@ typedef enum { ...@@ -36,11 +36,11 @@ typedef enum {
FIRMWARE_TYPE_SYMBOL FIRMWARE_TYPE_SYMBOL
} fwtype_t; } fwtype_t;
typedef struct { struct bss_element {
union hermes_scan_info bss; union hermes_scan_info bss;
unsigned long last_scanned; unsigned long last_scanned;
struct list_head list; struct list_head list;
} bss_element; };
struct orinoco_private { struct orinoco_private {
void *card; /* Pointer to card dependent structure */ void *card; /* Pointer to card dependent structure */
...@@ -117,7 +117,7 @@ struct orinoco_private { ...@@ -117,7 +117,7 @@ struct orinoco_private {
/* Scanning support */ /* Scanning support */
struct list_head bss_list; struct list_head bss_list;
struct list_head bss_free_list; struct list_head bss_free_list;
bss_element *bss_data; struct bss_element *bss_data;
int scan_inprogress; /* Scan pending... */ int scan_inprogress; /* Scan pending... */
u32 scan_mode; /* Type of scan done */ u32 scan_mode; /* Type of scan done */
......
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