Skip to content

Commit

Permalink
orinoco: address checkpatch typedef warning
Browse files Browse the repository at this point in the history
Just sprinkle the necessary structs around...

Signed-off-by: David Kilroy <kilroyd@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
David Kilroy authored and John W. Linville committed Aug 22, 2008
1 parent 6eecad7 commit 3056c40
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
13 changes: 7 additions & 6 deletions drivers/net/wireless/orinoco.c
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ static int orinoco_bss_data_allocate(struct orinoco_private *priv)
return 0;

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) {
printk(KERN_WARNING "Out of memory allocating beacons");
return -ENOMEM;
Expand Down Expand Up @@ -1413,8 +1414,8 @@ static void orinoco_send_wevents(struct work_struct *work)
static inline void orinoco_clear_scan_results(struct orinoco_private *priv,
unsigned long scan_age)
{
bss_element *bss;
bss_element *tmp_bss;
struct bss_element *bss;
struct bss_element *tmp_bss;

/* Blow away current list of scan results */
list_for_each_entry_safe(bss, tmp_bss, &priv->bss_list, list) {
Expand Down Expand Up @@ -1489,7 +1490,7 @@ static int orinoco_process_scan_results(struct net_device *dev,
/* Read the entries one by one */
for (; offset + atom_len <= len; offset += atom_len) {
int found = 0;
bss_element *bss = NULL;
struct bss_element *bss = NULL;

/* Get next atom */
atom = (union hermes_scan_info *) (buf + offset);
Expand All @@ -1511,7 +1512,7 @@ static int orinoco_process_scan_results(struct net_device *dev,
/* Grab a bss off the free list */
if (!found && !list_empty(&priv->bss_free_list)) {
bss = list_entry(priv->bss_free_list.next,
bss_element, list);
struct bss_element, list);
list_del(priv->bss_free_list.next);

list_add_tail(&bss->list, &priv->bss_list);
Expand Down Expand Up @@ -4547,7 +4548,7 @@ static int orinoco_ioctl_getscan(struct net_device *dev,
char *extra)
{
struct orinoco_private *priv = netdev_priv(dev);
bss_element *bss;
struct bss_element *bss;
int err = 0;
unsigned long flags;
char *current_ev = extra;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/orinoco.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ typedef enum {
FIRMWARE_TYPE_SYMBOL
} fwtype_t;

typedef struct {
struct bss_element {
union hermes_scan_info bss;
unsigned long last_scanned;
struct list_head list;
} bss_element;
};

struct orinoco_private {
void *card; /* Pointer to card dependent structure */
Expand Down Expand Up @@ -117,7 +117,7 @@ struct orinoco_private {
/* Scanning support */
struct list_head bss_list;
struct list_head bss_free_list;
bss_element *bss_data;
struct bss_element *bss_data;

int scan_inprogress; /* Scan pending... */
u32 scan_mode; /* Type of scan done */
Expand Down

0 comments on commit 3056c40

Please sign in to comment.