[13/15] orinoco merge preliminaries - don't typedef structs

David Gibson
2004-07-28T07:33:25Z

In line with normal kernel conventions, don't create typedefs for
structures.

Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/hermes.c
===================================================================
--- working-2.6.orig/drivers/net/wireless/hermes.c 2004-07-28 14:57:53.055551256 +1000
+++ working-2.6/drivers/net/wireless/hermes.c 2004-07-28 15:04:15.767370216 +1000
@@ -224,7 +224,7 @@
*
* Callable from any context, but locking is your problem. */
int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
- hermes_response_t *resp)
+ struct hermes_response *resp)
{
int err;
int k;
Index: working-2.6/drivers/net/wireless/hermes.h
===================================================================
--- working-2.6.orig/drivers/net/wireless/hermes.h 2004-07-28 14:58:27.164365928 +1000
+++ working-2.6/drivers/net/wireless/hermes.h 2004-07-28 15:01:39.039196520 +1000
@@ -252,9 +252,9 @@
u16 linkstatus; /* Link status */
} __attribute__ ((packed));

-typedef struct hermes_response {
+struct hermes_response {
u16 status, resp0, resp1, resp2;
-} hermes_response_t;
+};

/* "ID" structure - used for ESSID and station nickname */
struct hermes_idstring {
@@ -262,9 +262,9 @@
u16 val[16];
} __attribute__ ((packed));

-typedef struct hermes_multicast {
+struct hermes_multicast {
u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN];
-} __attribute__ ((packed)) hermes_multicast_t;
+} __attribute__ ((packed));

// #define HERMES_DEBUG_BUFFER 1
#define HERMES_DEBUG_BUFSIZE 4096
@@ -316,7 +316,7 @@
int reg_spacing);
int hermes_init(hermes_t *hw);
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_bap_pread(hermes_t *hw, int bap, void *buf, unsigned len,
Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================
--- working-2.6.orig/drivers/net/wireless/orinoco.c 2004-07-28 15:00:37.185599696 +1000
+++ working-2.6/drivers/net/wireless/orinoco.c 2004-07-28 15:05:05.235849864 +1000
@@ -1768,7 +1768,7 @@

if (! promisc && (mc_count || priv->mc_count) ) {
struct dev_mc_list *p = dev->mc_list;
- hermes_multicast_t mclist;
+ struct hermes_multicast mclist;
int i;

for (i = 0; i < mc_count; i++) {