Commit a0be09fb authored by David Gibson's avatar David Gibson Committed by Jeff Garzik

[PATCH] orinoco merge preliminaries - don't typedef structs

In line with normal kernel conventions, don't create typedefs for
structures.
Signed-off-by: default avatarDavid Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/hermes.c
===================================================================
parent 003698c4
...@@ -224,7 +224,7 @@ int hermes_init(hermes_t *hw) ...@@ -224,7 +224,7 @@ int hermes_init(hermes_t *hw)
* *
* Callable from any context, but locking is your problem. */ * Callable from any context, but locking is your problem. */
int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0, int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
hermes_response_t *resp) struct hermes_response *resp)
{ {
int err; int err;
int k; int k;
......
...@@ -252,9 +252,9 @@ struct hermes_linkstatus { ...@@ -252,9 +252,9 @@ struct hermes_linkstatus {
u16 linkstatus; /* Link status */ u16 linkstatus; /* Link status */
} __attribute__ ((packed)); } __attribute__ ((packed));
typedef struct hermes_response { struct hermes_response {
u16 status, resp0, resp1, resp2; u16 status, resp0, resp1, resp2;
} hermes_response_t; };
/* "ID" structure - used for ESSID and station nickname */ /* "ID" structure - used for ESSID and station nickname */
struct hermes_idstring { struct hermes_idstring {
...@@ -262,9 +262,9 @@ struct hermes_idstring { ...@@ -262,9 +262,9 @@ struct hermes_idstring {
u16 val[16]; u16 val[16];
} __attribute__ ((packed)); } __attribute__ ((packed));
typedef struct hermes_multicast { struct hermes_multicast {
u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN]; u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN];
} __attribute__ ((packed)) hermes_multicast_t; } __attribute__ ((packed));
// #define HERMES_DEBUG_BUFFER 1 // #define HERMES_DEBUG_BUFFER 1
#define HERMES_DEBUG_BUFSIZE 4096 #define HERMES_DEBUG_BUFSIZE 4096
...@@ -316,7 +316,7 @@ void hermes_struct_init(hermes_t *hw, ulong address, int io_space, ...@@ -316,7 +316,7 @@ void hermes_struct_init(hermes_t *hw, ulong address, int io_space,
int reg_spacing); int reg_spacing);
int hermes_init(hermes_t *hw); int hermes_init(hermes_t *hw);
int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0, int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
hermes_response_t *resp); struct hermes_response *resp);
int hermes_allocate(hermes_t *hw, u16 size, u16 *fid); int hermes_allocate(hermes_t *hw, u16 size, u16 *fid);
int hermes_bap_pread(hermes_t *hw, int bap, void *buf, unsigned len, int hermes_bap_pread(hermes_t *hw, int bap, void *buf, unsigned len,
......
...@@ -1768,7 +1768,7 @@ __orinoco_set_multicast_list(struct net_device *dev) ...@@ -1768,7 +1768,7 @@ __orinoco_set_multicast_list(struct net_device *dev)
if (! promisc && (mc_count || priv->mc_count) ) { if (! promisc && (mc_count || priv->mc_count) ) {
struct dev_mc_list *p = dev->mc_list; struct dev_mc_list *p = dev->mc_list;
hermes_multicast_t mclist; struct hermes_multicast mclist;
int i; int i;
for (i = 0; i < mc_count; i++) { for (i = 0; i < mc_count; i++) {
......
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