diff options
author | David Kilroy <kilroyd@gmail.com> | 2008-08-21 18:27:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-22 19:28:05 -0400 |
commit | 3056c40426b9cd4f7c334d773d69db64e195431d (patch) | |
tree | baf1cfcbb43a377c8d78419afc9f2f58f63ec871 | |
parent | 6eecad77861b193bcfc109de12835ca0bddf7c58 (diff) |
orinoco: address checkpatch typedef warning
Just sprinkle the necessary structs around...
Signed-off-by: David Kilroy <kilroyd@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/orinoco.c | 13 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco.h | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index b83415daa723..3d5570d0a262 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -279,7 +279,8 @@ static int orinoco_bss_data_allocate(struct orinoco_private *priv) | |||
279 | return 0; | 279 | return 0; |
280 | 280 | ||
281 | priv->bss_data = | 281 | priv->bss_data = |
282 | kzalloc(ORINOCO_MAX_BSS_COUNT * sizeof(bss_element), GFP_KERNEL); | 282 | kzalloc(ORINOCO_MAX_BSS_COUNT * sizeof(struct bss_element), |
283 | GFP_KERNEL); | ||
283 | if (!priv->bss_data) { | 284 | if (!priv->bss_data) { |
284 | printk(KERN_WARNING "Out of memory allocating beacons"); | 285 | printk(KERN_WARNING "Out of memory allocating beacons"); |
285 | return -ENOMEM; | 286 | return -ENOMEM; |
@@ -1413,8 +1414,8 @@ static void orinoco_send_wevents(struct work_struct *work) | |||
1413 | static inline void orinoco_clear_scan_results(struct orinoco_private *priv, | 1414 | static inline void orinoco_clear_scan_results(struct orinoco_private *priv, |
1414 | unsigned long scan_age) | 1415 | unsigned long scan_age) |
1415 | { | 1416 | { |
1416 | bss_element *bss; | 1417 | struct bss_element *bss; |
1417 | bss_element *tmp_bss; | 1418 | struct bss_element *tmp_bss; |
1418 | 1419 | ||
1419 | /* Blow away current list of scan results */ | 1420 | /* Blow away current list of scan results */ |
1420 | list_for_each_entry_safe(bss, tmp_bss, &priv->bss_list, list) { | 1421 | 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 | /* Read the entries one by one */ | 1490 | /* Read the entries one by one */ |
1490 | for (; offset + atom_len <= len; offset += atom_len) { | 1491 | for (; offset + atom_len <= len; offset += atom_len) { |
1491 | int found = 0; | 1492 | int found = 0; |
1492 | bss_element *bss = NULL; | 1493 | struct bss_element *bss = NULL; |
1493 | 1494 | ||
1494 | /* Get next atom */ | 1495 | /* Get next atom */ |
1495 | atom = (union hermes_scan_info *) (buf + offset); | 1496 | atom = (union hermes_scan_info *) (buf + offset); |
@@ -1511,7 +1512,7 @@ static int orinoco_process_scan_results(struct net_device *dev, | |||
1511 | /* Grab a bss off the free list */ | 1512 | /* Grab a bss off the free list */ |
1512 | if (!found && !list_empty(&priv->bss_free_list)) { | 1513 | if (!found && !list_empty(&priv->bss_free_list)) { |
1513 | bss = list_entry(priv->bss_free_list.next, | 1514 | bss = list_entry(priv->bss_free_list.next, |
1514 | bss_element, list); | 1515 | struct bss_element, list); |
1515 | list_del(priv->bss_free_list.next); | 1516 | list_del(priv->bss_free_list.next); |
1516 | 1517 | ||
1517 | list_add_tail(&bss->list, &priv->bss_list); | 1518 | list_add_tail(&bss->list, &priv->bss_list); |
@@ -4547,7 +4548,7 @@ static int orinoco_ioctl_getscan(struct net_device *dev, | |||
4547 | char *extra) | 4548 | char *extra) |
4548 | { | 4549 | { |
4549 | struct orinoco_private *priv = netdev_priv(dev); | 4550 | struct orinoco_private *priv = netdev_priv(dev); |
4550 | bss_element *bss; | 4551 | struct bss_element *bss; |
4551 | int err = 0; | 4552 | int err = 0; |
4552 | unsigned long flags; | 4553 | unsigned long flags; |
4553 | char *current_ev = extra; | 4554 | char *current_ev = extra; |
diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h index f93752ffb07c..584d8c92db12 100644 --- a/drivers/net/wireless/orinoco.h +++ b/drivers/net/wireless/orinoco.h | |||
@@ -36,11 +36,11 @@ typedef enum { | |||
36 | FIRMWARE_TYPE_SYMBOL | 36 | FIRMWARE_TYPE_SYMBOL |
37 | } fwtype_t; | 37 | } fwtype_t; |
38 | 38 | ||
39 | typedef struct { | 39 | struct bss_element { |
40 | union hermes_scan_info bss; | 40 | union hermes_scan_info bss; |
41 | unsigned long last_scanned; | 41 | unsigned long last_scanned; |
42 | struct list_head list; | 42 | struct list_head list; |
43 | } bss_element; | 43 | }; |
44 | 44 | ||
45 | struct orinoco_private { | 45 | struct orinoco_private { |
46 | void *card; /* Pointer to card dependent structure */ | 46 | void *card; /* Pointer to card dependent structure */ |
@@ -117,7 +117,7 @@ struct orinoco_private { | |||
117 | /* Scanning support */ | 117 | /* Scanning support */ |
118 | struct list_head bss_list; | 118 | struct list_head bss_list; |
119 | struct list_head bss_free_list; | 119 | struct list_head bss_free_list; |
120 | bss_element *bss_data; | 120 | struct bss_element *bss_data; |
121 | 121 | ||
122 | int scan_inprogress; /* Scan pending... */ | 122 | int scan_inprogress; /* Scan pending... */ |
123 | u32 scan_mode; /* Type of scan done */ | 123 | u32 scan_mode; /* Type of scan done */ |