Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 21:23:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

orinoco: minor fixes for problems found by checkpatch.pl

Browse Source 
Eliminate spaces before tabs.  Eliminate typedefs.  Add spaces around
operators.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Roskin 2011-07-13 11:19:57 -04:00 committed by John W. Linville
parent 16c929df08
commit 933d594313
21 changed files with 155 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/orinoco/airport.c
View File

@ -150,7 +150,7 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)
struct orinoco_private *priv; struct orinoco_private *priv;
struct airport *card; struct airport *card;
unsigned long phys_addr; unsigned long phys_addr;
hermes_t *hw; struct hermes *hw;
if (macio_resource_count(mdev) < 1 || macio_irq_count(mdev) < 1) { if (macio_resource_count(mdev) < 1 || macio_irq_count(mdev) < 1) {
printk(KERN_ERR PFX "Wrong interrupt/addresses in OF tree\n"); printk(KERN_ERR PFX "Wrong interrupt/addresses in OF tree\n");
@ -228,8 +228,7 @@ MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
MODULE_DESCRIPTION("Driver for the Apple Airport wireless card."); MODULE_DESCRIPTION("Driver for the Apple Airport wireless card.");
MODULE_LICENSE("Dual MPL/GPL"); MODULE_LICENSE("Dual MPL/GPL");
static struct of_device_id airport_match[] = static struct of_device_id airport_match[] = {
{
{ {
.name = "radio", .name = "radio",
}, },

2
drivers/net/wireless/orinoco/cfg.c
View File

@ -191,7 +191,7 @@ static int orinoco_set_channel(struct wiphy *wiphy,
priv->channel = channel; priv->channel = channel;
if (priv->iw_mode == NL80211_IFTYPE_MONITOR) { if (priv->iw_mode == NL80211_IFTYPE_MONITOR) {
/* Fast channel change - no commit if successful */ /* Fast channel change - no commit if successful */
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST | err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST |
HERMES_TEST_SET_CHANNEL, HERMES_TEST_SET_CHANNEL,
channel, NULL); channel, NULL);

7
drivers/net/wireless/orinoco/fw.c
View File

@ -100,7 +100,7 @@ orinoco_dl_firmware(struct orinoco_private *priv,
/* Plug Data Area (PDA) */ /* Plug Data Area (PDA) */
__le16 *pda; __le16 *pda;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
const struct firmware *fw_entry; const struct firmware *fw_entry;
const struct orinoco_fw_header *hdr; const struct orinoco_fw_header *hdr;
const unsigned char *first_block; const unsigned char *first_block;
@ -205,7 +205,7 @@ symbol_dl_image(struct orinoco_private *priv, const struct fw_info *fw,
const unsigned char *image, const void *end, const unsigned char *image, const void *end,
int secondary) int secondary)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int ret = 0; int ret = 0;
const unsigned char *ptr; const unsigned char *ptr;
const unsigned char *first_block; const unsigned char *first_block;
@ -322,9 +322,8 @@ symbol_dl_firmware(struct orinoco_private *priv,
fw_entry->data + fw_entry->size, 1); fw_entry->data + fw_entry->size, 1);
if (!orinoco_cached_fw_get(priv, false)) if (!orinoco_cached_fw_get(priv, false))
release_firmware(fw_entry); release_firmware(fw_entry);
if (ret) { if (ret)
dev_err(dev, "Secondary firmware download failed\n"); dev_err(dev, "Secondary firmware download failed\n");
}
return ret; return ret;
} }

38
drivers/net/wireless/orinoco/hermes.c
View File

@ -103,7 +103,7 @@ static const struct hermes_ops hermes_ops_local;
Callable from any context. Callable from any context.
*/ */
static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0, static int hermes_issue_cmd(struct hermes *hw, u16 cmd, u16 param0,
u16 param1, u16 param2) u16 param1, u16 param2)
{ {
int k = CMD_BUSY_TIMEOUT; int k = CMD_BUSY_TIMEOUT;
@ -132,7 +132,7 @@ static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0,
*/ */
/* For doing cmds that wipe the magic constant in SWSUPPORT0 */ /* For doing cmds that wipe the magic constant in SWSUPPORT0 */
static int hermes_doicmd_wait(hermes_t *hw, u16 cmd, static int hermes_doicmd_wait(struct hermes *hw, u16 cmd,
u16 parm0, u16 parm1, u16 parm2, u16 parm0, u16 parm1, u16 parm2,
struct hermes_response *resp) struct hermes_response *resp)
{ {
@ -185,7 +185,8 @@ out:
return err; return err;
} }
void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing) void hermes_struct_init(struct hermes *hw, void __iomem *address,
int reg_spacing)
{ {
hw->iobase = address; hw->iobase = address;
hw->reg_spacing = reg_spacing; hw->reg_spacing = reg_spacing;
@ -195,7 +196,7 @@ void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing)
} }
EXPORT_SYMBOL(hermes_struct_init); EXPORT_SYMBOL(hermes_struct_init);
static int hermes_init(hermes_t *hw) static int hermes_init(struct hermes *hw)
{ {
u16 reg; u16 reg;
int err = 0; int err = 0;
@ -249,7 +250,7 @@ static int hermes_init(hermes_t *hw)
* > 0 on error returned by the firmware * > 0 on error returned by the firmware
* *
* Callable from any context, but locking is your problem. */ * Callable from any context, but locking is your problem. */
static int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0, static int hermes_docmd_wait(struct hermes *hw, u16 cmd, u16 parm0,
struct hermes_response *resp) struct hermes_response *resp)
{ {
int err; int err;
@ -313,7 +314,7 @@ static int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
return err; return err;
} }
static int hermes_allocate(hermes_t *hw, u16 size, u16 *fid) static int hermes_allocate(struct hermes *hw, u16 size, u16 *fid)
{ {
int err = 0; int err = 0;
int k; int k;
@ -363,7 +364,7 @@ static int hermes_allocate(hermes_t *hw, u16 size, u16 *fid)
* from firmware * from firmware
* *
* Callable from any context */ * Callable from any context */
static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset) static int hermes_bap_seek(struct hermes *hw, int bap, u16 id, u16 offset)
{ {
int sreg = bap ? HERMES_SELECT1 : HERMES_SELECT0; int sreg = bap ? HERMES_SELECT1 : HERMES_SELECT0;
int oreg = bap ? HERMES_OFFSET1 : HERMES_OFFSET0; int oreg = bap ? HERMES_OFFSET1 : HERMES_OFFSET0;
@ -422,7 +423,7 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset)
* 0 on success * 0 on success
* > 0 on error from firmware * > 0 on error from firmware
*/ */
static int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len, static int hermes_bap_pread(struct hermes *hw, int bap, void *buf, int len,
u16 id, u16 offset) u16 id, u16 offset)
{ {
int dreg = bap ? HERMES_DATA1 : HERMES_DATA0; int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
@ -450,8 +451,8 @@ static int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,
* 0 on success * 0 on success
* > 0 on error from firmware * > 0 on error from firmware
*/ */
static int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len, static int hermes_bap_pwrite(struct hermes *hw, int bap, const void *buf,
u16 id, u16 offset) int len, u16 id, u16 offset)
{ {
int dreg = bap ? HERMES_DATA1 : HERMES_DATA0; int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
int err = 0; int err = 0;
@ -478,8 +479,8 @@ static int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,
* practice. * practice.
* *
* Callable from user or bh context. */ * Callable from user or bh context. */
static int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize, static int hermes_read_ltv(struct hermes *hw, int bap, u16 rid,
u16 *length, void *buf) unsigned bufsize, u16 *length, void *buf)
{ {
int err = 0; int err = 0;
int dreg = bap ? HERMES_DATA1 : HERMES_DATA0; int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
@ -523,7 +524,7 @@ static int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize,
return 0; return 0;
} }
static int hermes_write_ltv(hermes_t *hw, int bap, u16 rid, static int hermes_write_ltv(struct hermes *hw, int bap, u16 rid,
u16 length, const void *value) u16 length, const void *value)
{ {
int dreg = bap ? HERMES_DATA1 : HERMES_DATA0; int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
@ -553,14 +554,14 @@ static int hermes_write_ltv(hermes_t *hw, int bap, u16 rid,
/*** Hermes AUX control ***/ /*** Hermes AUX control ***/
static inline void static inline void
hermes_aux_setaddr(hermes_t *hw, u32 addr) hermes_aux_setaddr(struct hermes *hw, u32 addr)
{ {
hermes_write_reg(hw, HERMES_AUXPAGE, (u16) (addr >> 7)); hermes_write_reg(hw, HERMES_AUXPAGE, (u16) (addr >> 7));
hermes_write_reg(hw, HERMES_AUXOFFSET, (u16) (addr & 0x7F)); hermes_write_reg(hw, HERMES_AUXOFFSET, (u16) (addr & 0x7F));
} }
static inline int static inline int
hermes_aux_control(hermes_t *hw, int enabled) hermes_aux_control(struct hermes *hw, int enabled)
{ {
int desired_state = enabled ? HERMES_AUX_ENABLED : HERMES_AUX_DISABLED; int desired_state = enabled ? HERMES_AUX_ENABLED : HERMES_AUX_DISABLED;
int action = enabled ? HERMES_AUX_ENABLE : HERMES_AUX_DISABLE; int action = enabled ? HERMES_AUX_ENABLE : HERMES_AUX_DISABLE;
@ -594,7 +595,7 @@ hermes_aux_control(hermes_t *hw, int enabled)
* wl_lkm Agere fw does * wl_lkm Agere fw does
* Don't know about intersil * Don't know about intersil
*/ */
static int hermesi_program_init(hermes_t *hw, u32 offset) static int hermesi_program_init(struct hermes *hw, u32 offset)
{ {
int err; int err;
@ -643,7 +644,7 @@ static int hermesi_program_init(hermes_t *hw, u32 offset)
* wl_lkm Agere fw does * wl_lkm Agere fw does
* Don't know about intersil * Don't know about intersil
*/ */
static int hermesi_program_end(hermes_t *hw) static int hermesi_program_end(struct hermes *hw)
{ {
struct hermes_response resp; struct hermes_response resp;
int rc = 0; int rc = 0;
@ -684,7 +685,8 @@ static int hermes_program_bytes(struct hermes *hw, const char *data,
} }
/* Read PDA from the adapter */ /* Read PDA from the adapter */
static int hermes_read_pda(hermes_t *hw, __le16 *pda, u32 pda_addr, u16 pda_len) static int hermes_read_pda(struct hermes *hw, __le16 *pda, u32 pda_addr,
u16 pda_len)
{ {
int ret; int ret;
u16 pda_size; u16 pda_size;

25
drivers/net/wireless/orinoco/hermes.h
View File

@ -28,7 +28,7 @@
* *
* As a module of low level hardware access routines, there is no * As a module of low level hardware access routines, there is no
* locking. Users of this module should ensure that they serialize * locking. Users of this module should ensure that they serialize
* access to the hermes_t structure, and to the hardware * access to the hermes structure, and to the hardware
*/ */
#include <linux/if_ether.h> #include <linux/if_ether.h>
@ -406,7 +406,7 @@ struct hermes_ops {
}; };
/* Basic control structure */ /* Basic control structure */
typedef struct hermes { struct hermes {
void __iomem *iobase; void __iomem *iobase;
int reg_spacing; int reg_spacing;
#define HERMES_16BIT_REGSPACING 0 #define HERMES_16BIT_REGSPACING 0
@ -415,7 +415,7 @@ typedef struct hermes {
bool eeprom_pda; bool eeprom_pda;
const struct hermes_ops *ops; const struct hermes_ops *ops;
void *priv; void *priv;
} hermes_t; };
/* Register access convenience macros */ /* Register access convenience macros */
#define hermes_read_reg(hw, off) \ #define hermes_read_reg(hw, off) \
@ -427,28 +427,29 @@ typedef struct hermes {
hermes_write_reg((hw), HERMES_##name, (val)) hermes_write_reg((hw), HERMES_##name, (val))
/* Function prototypes */ /* Function prototypes */
void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing); void hermes_struct_init(struct hermes *hw, void __iomem *address,
int reg_spacing);
/* Inline functions */ /* Inline functions */
static inline int hermes_present(hermes_t *hw) static inline int hermes_present(struct hermes *hw)
{ {
return hermes_read_regn(hw, SWSUPPORT0) == HERMES_MAGIC; return hermes_read_regn(hw, SWSUPPORT0) == HERMES_MAGIC;
} }
static inline void hermes_set_irqmask(hermes_t *hw, u16 events) static inline void hermes_set_irqmask(struct hermes *hw, u16 events)
{ {
hw->inten = events; hw->inten = events;
hermes_write_regn(hw, INTEN, events); hermes_write_regn(hw, INTEN, events);
} }
static inline int hermes_enable_port(hermes_t *hw, int port) static inline int hermes_enable_port(struct hermes *hw, int port)
{ {
return hw->ops->cmd_wait(hw, HERMES_CMD_ENABLE | (port << 8), return hw->ops->cmd_wait(hw, HERMES_CMD_ENABLE | (port << 8),
0, NULL); 0, NULL);
} }
static inline int hermes_disable_port(hermes_t *hw, int port) static inline int hermes_disable_port(struct hermes *hw, int port)
{ {
return hw->ops->cmd_wait(hw, HERMES_CMD_DISABLE | (port << 8), return hw->ops->cmd_wait(hw, HERMES_CMD_DISABLE | (port << 8),
0, NULL); 0, NULL);
@ -456,7 +457,7 @@ static inline int hermes_disable_port(hermes_t *hw, int port)
/* Initiate an INQUIRE command (tallies or scan). The result will come as an /* Initiate an INQUIRE command (tallies or scan). The result will come as an
* information frame in __orinoco_ev_info() */ * information frame in __orinoco_ev_info() */
static inline int hermes_inquire(hermes_t *hw, u16 rid) static inline int hermes_inquire(struct hermes *hw, u16 rid)
{ {
return hw->ops->cmd_wait(hw, HERMES_CMD_INQUIRE, rid, NULL); return hw->ops->cmd_wait(hw, HERMES_CMD_INQUIRE, rid, NULL);
} }
@ -498,7 +499,8 @@ static inline void hermes_clear_words(struct hermes *hw, int off,
(hw->ops->write_ltv((hw), (bap), (rid), \ (hw->ops->write_ltv((hw), (bap), (rid), \
HERMES_BYTES_TO_RECLEN(sizeof(*buf)), (buf))) HERMES_BYTES_TO_RECLEN(sizeof(*buf)), (buf)))
static inline int hermes_read_wordrec(hermes_t *hw, int bap, u16 rid, u16 *word) static inline int hermes_read_wordrec(struct hermes *hw, int bap, u16 rid,
u16 *word)
{ {
__le16 rec; __le16 rec;
int err; int err;
@ -508,7 +510,8 @@ static inline int hermes_read_wordrec(hermes_t *hw, int bap, u16 rid, u16 *word)
return err; return err;
} }
static inline int hermes_write_wordrec(hermes_t *hw, int bap, u16 rid, u16 word) static inline int hermes_write_wordrec(struct hermes *hw, int bap, u16 rid,
u16 word)
{ {
__le16 rec = cpu_to_le16(word); __le16 rec = cpu_to_le16(word);
return HERMES_WRITE_RECORD(hw, bap, rid, &rec); return HERMES_WRITE_RECORD(hw, bap, rid, &rec);

8
drivers/net/wireless/orinoco/hermes_dld.c
View File

@ -193,7 +193,7 @@ hermes_find_pdi(const struct pdi *first_pdi, u32 record_id, const void *end)
/* Process one Plug Data Item - find corresponding PDR and plug it */ /* Process one Plug Data Item - find corresponding PDR and plug it */
static int static int
hermes_plug_pdi(hermes_t *hw, const struct pdr *first_pdr, hermes_plug_pdi(struct hermes *hw, const struct pdr *first_pdr,
const struct pdi *pdi, const void *pdr_end) const struct pdi *pdi, const void *pdr_end)
{ {
const struct pdr *pdr; const struct pdr *pdr;
@ -220,7 +220,7 @@ hermes_plug_pdi(hermes_t *hw, const struct pdr *first_pdr,
* Attempt to write every records that is in the specified pda * Attempt to write every records that is in the specified pda
* which also has a valid production data record for the firmware. * which also has a valid production data record for the firmware.
*/ */
int hermes_apply_pda(hermes_t *hw, int hermes_apply_pda(struct hermes *hw,
const char *first_pdr, const char *first_pdr,
const void *pdr_end, const void *pdr_end,
const __le16 *pda, const __le16 *pda,
@ -274,7 +274,7 @@ hermes_blocks_length(const char *first_block, const void *end)
/*** Hermes programming ***/ /*** Hermes programming ***/
/* Program the data blocks */ /* Program the data blocks */
int hermes_program(hermes_t *hw, const char *first_block, const void *end) int hermes_program(struct hermes *hw, const char *first_block, const void *end)
{ {
const struct dblock *blk; const struct dblock *blk;
u32 blkaddr; u32 blkaddr;
@ -387,7 +387,7 @@ DEFINE_DEFAULT_PDR(0x0161, 256,
* *
* For certain records, use defaults if they are not found in pda. * For certain records, use defaults if they are not found in pda.
*/ */
int hermes_apply_pda_with_defaults(hermes_t *hw, int hermes_apply_pda_with_defaults(struct hermes *hw,
const char *first_pdr, const char *first_pdr,
const void *pdr_end, const void *pdr_end,
const __le16 *pda, const __le16 *pda,

12
drivers/net/wireless/orinoco/hermes_dld.h
View File

@ -27,21 +27,21 @@
#include "hermes.h" #include "hermes.h"
int hermesi_program_init(hermes_t *hw, u32 offset); int hermesi_program_init(struct hermes *hw, u32 offset);
int hermesi_program_end(hermes_t *hw); int hermesi_program_end(struct hermes *hw);
int hermes_program(hermes_t *hw, const char *first_block, const void *end); int hermes_program(struct hermes *hw, const char *first_block, const void *end);
int hermes_read_pda(hermes_t *hw, int hermes_read_pda(struct hermes *hw,
__le16 *pda, __le16 *pda,
u32 pda_addr, u32 pda_addr,
u16 pda_len, u16 pda_len,
int use_eeprom); int use_eeprom);
int hermes_apply_pda(hermes_t *hw, int hermes_apply_pda(struct hermes *hw,
const char *first_pdr, const char *first_pdr,
const void *pdr_end, const void *pdr_end,
const __le16 *pda, const __le16 *pda,
const void *pda_end); const void *pda_end);
int hermes_apply_pda_with_defaults(hermes_t *hw, int hermes_apply_pda_with_defaults(struct hermes *hw,
const char *first_pdr, const char *first_pdr,
const void *pdr_end, const void *pdr_end,
const __le16 *pda, const __le16 *pda,

38
drivers/net/wireless/orinoco/hw.c
View File

@ -47,7 +47,7 @@ struct comp_id {
u16 id, variant, major, minor; u16 id, variant, major, minor;
} __packed; } __packed;
static inline fwtype_t determine_firmware_type(struct comp_id *nic_id) static inline enum fwtype determine_firmware_type(struct comp_id *nic_id)
{ {
if (nic_id->id < 0x8000) if (nic_id->id < 0x8000)
return FIRMWARE_TYPE_AGERE; return FIRMWARE_TYPE_AGERE;
@ -71,7 +71,7 @@ int determine_fw_capabilities(struct orinoco_private *priv,
u32 *hw_ver) u32 *hw_ver)
{ {
struct device *dev = priv->dev; struct device *dev = priv->dev;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err; int err;
struct comp_id nic_id, sta_id; struct comp_id nic_id, sta_id;
unsigned int firmver; unsigned int firmver;
@ -280,7 +280,7 @@ int orinoco_hw_read_card_settings(struct orinoco_private *priv, u8 *dev_addr)
{ {
struct device *dev = priv->dev; struct device *dev = priv->dev;
struct hermes_idstring nickbuf; struct hermes_idstring nickbuf;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int len; int len;
int err; int err;
u16 reclen; u16 reclen;
@ -458,7 +458,7 @@ int orinoco_hw_program_rids(struct orinoco_private *priv)
{ {
struct net_device *dev = priv->ndev; struct net_device *dev = priv->ndev;
struct wireless_dev *wdev = netdev_priv(dev); struct wireless_dev *wdev = netdev_priv(dev);
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err; int err;
struct hermes_idstring idbuf; struct hermes_idstring idbuf;
@ -689,7 +689,7 @@ int orinoco_hw_program_rids(struct orinoco_private *priv)
/* Get tsc from the firmware */ /* Get tsc from the firmware */
int orinoco_hw_get_tkip_iv(struct orinoco_private *priv, int key, u8 *tsc) int orinoco_hw_get_tkip_iv(struct orinoco_private *priv, int key, u8 *tsc)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
u8 tsc_arr[4][ORINOCO_SEQ_LEN]; u8 tsc_arr[4][ORINOCO_SEQ_LEN];
@ -706,7 +706,7 @@ int orinoco_hw_get_tkip_iv(struct orinoco_private *priv, int key, u8 *tsc)
int __orinoco_hw_set_bitrate(struct orinoco_private *priv) int __orinoco_hw_set_bitrate(struct orinoco_private *priv)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int ratemode = priv->bitratemode; int ratemode = priv->bitratemode;
int err = 0; int err = 0;
@ -737,7 +737,7 @@ int __orinoco_hw_set_bitrate(struct orinoco_private *priv)
int orinoco_hw_get_act_bitrate(struct orinoco_private *priv, int *bitrate) int orinoco_hw_get_act_bitrate(struct orinoco_private *priv, int *bitrate)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int i; int i;
int err = 0; int err = 0;
u16 val; u16 val;
@ -786,7 +786,7 @@ int __orinoco_hw_set_wap(struct orinoco_private *priv)
{ {
int roaming_flag; int roaming_flag;
int err = 0; int err = 0;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
switch (priv->firmware_type) { switch (priv->firmware_type) {
case FIRMWARE_TYPE_AGERE: case FIRMWARE_TYPE_AGERE:
@ -818,7 +818,7 @@ int __orinoco_hw_set_wap(struct orinoco_private *priv)
* which is needed for 802.1x implementations. */ * which is needed for 802.1x implementations. */
int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv) int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
int i; int i;
@ -902,7 +902,7 @@ int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv)
int __orinoco_hw_setup_enc(struct orinoco_private *priv) int __orinoco_hw_setup_enc(struct orinoco_private *priv)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
int master_wep_flag; int master_wep_flag;
int auth_flag; int auth_flag;
@ -999,7 +999,7 @@ int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
u8 rx_mic[MIC_KEYLEN]; u8 rx_mic[MIC_KEYLEN];
u8 tsc[ORINOCO_SEQ_LEN]; u8 tsc[ORINOCO_SEQ_LEN];
} __packed buf; } __packed buf;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int ret; int ret;
int err; int err;
int k; int k;
@ -1052,7 +1052,7 @@ int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
int orinoco_clear_tkip_key(struct orinoco_private *priv, int key_idx) int orinoco_clear_tkip_key(struct orinoco_private *priv, int key_idx)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err; int err;
err = hermes_write_wordrec(hw, USER_BAP, err = hermes_write_wordrec(hw, USER_BAP,
@ -1068,7 +1068,7 @@ int __orinoco_hw_set_multicast_list(struct orinoco_private *priv,
struct net_device *dev, struct net_device *dev,
int mc_count, int promisc) int mc_count, int promisc)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
if (promisc != priv->promiscuous) { if (promisc != priv->promiscuous) {
@ -1113,7 +1113,7 @@ int __orinoco_hw_set_multicast_list(struct orinoco_private *priv,
int orinoco_hw_get_essid(struct orinoco_private *priv, int *active, int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
char buf[IW_ESSID_MAX_SIZE + 1]) char buf[IW_ESSID_MAX_SIZE + 1])
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
struct hermes_idstring essidbuf; struct hermes_idstring essidbuf;
char *p = (char *)(&essidbuf.val); char *p = (char *)(&essidbuf.val);
@ -1166,7 +1166,7 @@ int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
int orinoco_hw_get_freq(struct orinoco_private *priv) int orinoco_hw_get_freq(struct orinoco_private *priv)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
u16 channel; u16 channel;
int freq = 0; int freq = 0;
@ -1206,7 +1206,7 @@ int orinoco_hw_get_freq(struct orinoco_private *priv)
int orinoco_hw_get_bitratelist(struct orinoco_private *priv, int orinoco_hw_get_bitratelist(struct orinoco_private *priv,
int *numrates, s32 *rates, int max) int *numrates, s32 *rates, int max)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
struct hermes_idstring list; struct hermes_idstring list;
unsigned char *p = (unsigned char *)&list.val; unsigned char *p = (unsigned char *)&list.val;
int err = 0; int err = 0;
@ -1238,7 +1238,7 @@ int orinoco_hw_trigger_scan(struct orinoco_private *priv,
const struct cfg80211_ssid *ssid) const struct cfg80211_ssid *ssid)
{ {
struct net_device *dev = priv->ndev; struct net_device *dev = priv->ndev;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
unsigned long flags; unsigned long flags;
int err = 0; int err = 0;
@ -1323,7 +1323,7 @@ int orinoco_hw_trigger_scan(struct orinoco_private *priv,
int orinoco_hw_disassociate(struct orinoco_private *priv, int orinoco_hw_disassociate(struct orinoco_private *priv,
u8 *addr, u16 reason_code) u8 *addr, u16 reason_code)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err; int err;
struct { struct {
@ -1346,7 +1346,7 @@ int orinoco_hw_disassociate(struct orinoco_private *priv,
int orinoco_hw_get_current_bssid(struct orinoco_private *priv, int orinoco_hw_get_current_bssid(struct orinoco_private *priv,
u8 *addr) u8 *addr)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err; int err;
err = hw->ops->read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID, err = hw->ops->read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID,

26
drivers/net/wireless/orinoco/main.c
View File

@ -437,7 +437,7 @@ static netdev_tx_t orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
struct net_device_stats *stats = &priv->stats; struct net_device_stats *stats = &priv->stats;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
u16 txfid = priv->txfid; u16 txfid = priv->txfid;
int tx_control; int tx_control;
@ -579,7 +579,7 @@ static netdev_tx_t orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;
} }
static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw) static void __orinoco_ev_alloc(struct net_device *dev, struct hermes *hw)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
u16 fid = hermes_read_regn(hw, ALLOCFID); u16 fid = hermes_read_regn(hw, ALLOCFID);
@ -594,7 +594,7 @@ static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw)
hermes_write_regn(hw, ALLOCFID, DUMMY_FID); hermes_write_regn(hw, ALLOCFID, DUMMY_FID);
} }
static void __orinoco_ev_tx(struct net_device *dev, hermes_t *hw) static void __orinoco_ev_tx(struct net_device *dev, struct hermes *hw)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
struct net_device_stats *stats = &priv->stats; struct net_device_stats *stats = &priv->stats;
@ -606,7 +606,7 @@ static void __orinoco_ev_tx(struct net_device *dev, hermes_t *hw)
hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID); hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);
} }
static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw) static void __orinoco_ev_txexc(struct net_device *dev, struct hermes *hw)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
struct net_device_stats *stats = &priv->stats; struct net_device_stats *stats = &priv->stats;
@ -753,7 +753,7 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
struct sk_buff *skb; struct sk_buff *skb;
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
struct net_device_stats *stats = &priv->stats; struct net_device_stats *stats = &priv->stats;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
len = le16_to_cpu(desc->data_len); len = le16_to_cpu(desc->data_len);
@ -840,7 +840,7 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
stats->rx_dropped++; stats->rx_dropped++;
} }
void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw) void __orinoco_ev_rx(struct net_device *dev, struct hermes *hw)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
struct net_device_stats *stats = &priv->stats; struct net_device_stats *stats = &priv->stats;
@ -1402,7 +1402,7 @@ static void orinoco_process_scan_results(struct work_struct *work)
spin_unlock_irqrestore(&priv->scan_lock, flags); spin_unlock_irqrestore(&priv->scan_lock, flags);
} }
void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) void __orinoco_ev_info(struct net_device *dev, struct hermes *hw)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
u16 infofid; u16 infofid;
@ -1620,7 +1620,7 @@ void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
} }
EXPORT_SYMBOL(__orinoco_ev_info); EXPORT_SYMBOL(__orinoco_ev_info);
static void __orinoco_ev_infdrop(struct net_device *dev, hermes_t *hw) static void __orinoco_ev_infdrop(struct net_device *dev, struct hermes *hw)
{ {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_DEBUG "%s: Information frame lost.\n", dev->name); printk(KERN_DEBUG "%s: Information frame lost.\n", dev->name);
@ -1831,7 +1831,7 @@ static int __orinoco_commit(struct orinoco_private *priv)
int orinoco_commit(struct orinoco_private *priv) int orinoco_commit(struct orinoco_private *priv)
{ {
struct net_device *dev = priv->ndev; struct net_device *dev = priv->ndev;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err; int err;
if (priv->broken_disableport) { if (priv->broken_disableport) {
@ -1874,12 +1874,12 @@ int orinoco_commit(struct orinoco_private *priv)
/* Interrupt handler */ /* Interrupt handler */
/********************************************************************/ /********************************************************************/
static void __orinoco_ev_tick(struct net_device *dev, hermes_t *hw) static void __orinoco_ev_tick(struct net_device *dev, struct hermes *hw)
{ {
printk(KERN_DEBUG "%s: TICK\n", dev->name); printk(KERN_DEBUG "%s: TICK\n", dev->name);
} }
static void __orinoco_ev_wterr(struct net_device *dev, hermes_t *hw) static void __orinoco_ev_wterr(struct net_device *dev, struct hermes *hw)
{ {
/* This seems to happen a fair bit under load, but ignoring it /* This seems to happen a fair bit under load, but ignoring it
seems to work fine...*/ seems to work fine...*/
@ -1891,7 +1891,7 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id)
{ {
struct orinoco_private *priv = dev_id; struct orinoco_private *priv = dev_id;
struct net_device *dev = priv->ndev; struct net_device *dev = priv->ndev;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int count = MAX_IRQLOOPS_PER_IRQ; int count = MAX_IRQLOOPS_PER_IRQ;
u16 evstat, events; u16 evstat, events;
/* These are used to detect a runaway interrupt situation. /* These are used to detect a runaway interrupt situation.
@ -2029,7 +2029,7 @@ int orinoco_init(struct orinoco_private *priv)
{ {
struct device *dev = priv->dev; struct device *dev = priv->dev;
struct wiphy *wiphy = priv_to_wiphy(priv); struct wiphy *wiphy = priv_to_wiphy(priv);
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
/* No need to lock, the hw_unavailable flag is already set in /* No need to lock, the hw_unavailable flag is already set in

12
drivers/net/wireless/orinoco/orinoco.h
View File

@ -49,11 +49,11 @@ enum orinoco_alg {
ORINOCO_ALG_TKIP ORINOCO_ALG_TKIP
}; };
typedef enum { enum fwtype {
FIRMWARE_TYPE_AGERE, FIRMWARE_TYPE_AGERE,
FIRMWARE_TYPE_INTERSIL, FIRMWARE_TYPE_INTERSIL,
FIRMWARE_TYPE_SYMBOL FIRMWARE_TYPE_SYMBOL
} fwtype_t; };
struct firmware; struct firmware;
@ -88,11 +88,11 @@ struct orinoco_private {
struct iw_statistics wstats; struct iw_statistics wstats;
/* Hardware control variables */ /* Hardware control variables */
hermes_t hw; struct hermes hw;
u16 txfid; u16 txfid;
/* Capabilities of the hardware/firmware */ /* Capabilities of the hardware/firmware */
fwtype_t firmware_type; enum fwtype firmware_type;
int ibss_port; int ibss_port;
int nicbuf_size; int nicbuf_size;
u16 channel_mask; u16 channel_mask;
@ -197,8 +197,8 @@ extern int orinoco_up(struct orinoco_private *priv);
extern void orinoco_down(struct orinoco_private *priv); extern void orinoco_down(struct orinoco_private *priv);
extern irqreturn_t orinoco_interrupt(int irq, void *dev_id); extern irqreturn_t orinoco_interrupt(int irq, void *dev_id);
extern void __orinoco_ev_info(struct net_device *dev, hermes_t *hw); extern void __orinoco_ev_info(struct net_device *dev, struct hermes *hw);
extern void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw); extern void __orinoco_ev_rx(struct net_device *dev, struct hermes *hw);
int orinoco_process_xmit_skb(struct sk_buff *skb, int orinoco_process_xmit_skb(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,

2
drivers/net/wireless/orinoco/orinoco_cs.c
View File

@ -134,7 +134,7 @@ static int
orinoco_cs_config(struct pcmcia_device *link) orinoco_cs_config(struct pcmcia_device *link)
{ {
struct orinoco_private *priv = link->priv; struct orinoco_private *priv = link->priv;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int ret; int ret;
void __iomem *mem; void __iomem *mem;

3
drivers/net/wireless/orinoco/orinoco_nortel.c
View File

@ -296,8 +296,7 @@ static struct pci_driver orinoco_nortel_driver = {
static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
" (Tobias Hoffmann & Christoph Jungegger <disdos@traum404.de>)"; " (Tobias Hoffmann & Christoph Jungegger <disdos@traum404.de>)";
MODULE_AUTHOR("Christoph Jungegger <disdos@traum404.de>"); MODULE_AUTHOR("Christoph Jungegger <disdos@traum404.de>");
MODULE_DESCRIPTION MODULE_DESCRIPTION("Driver for wireless LAN cards using the Nortel PCI bridge");
("Driver for wireless LAN cards using the Nortel PCI bridge");
MODULE_LICENSE("Dual MPL/GPL"); MODULE_LICENSE("Dual MPL/GPL");
static int __init orinoco_nortel_init(void) static int __init orinoco_nortel_init(void)

2
drivers/net/wireless/orinoco/orinoco_pci.c
View File

@ -81,7 +81,7 @@
*/ */
static int orinoco_pci_cor_reset(struct orinoco_private *priv) static int orinoco_pci_cor_reset(struct orinoco_private *priv)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
unsigned long timeout; unsigned long timeout;
u16 reg; u16 reg;

2
drivers/net/wireless/orinoco/orinoco_plx.c
View File

@ -109,7 +109,7 @@
*/ */
static int orinoco_plx_cor_reset(struct orinoco_private *priv) static int orinoco_plx_cor_reset(struct orinoco_private *priv)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
struct orinoco_pci_card *card = priv->card; struct orinoco_pci_card *card = priv->card;
unsigned long timeout; unsigned long timeout;
u16 reg; u16 reg;

2
drivers/net/wireless/orinoco/orinoco_tmd.c
View File

@ -59,7 +59,7 @@
*/ */
static int orinoco_tmd_cor_reset(struct orinoco_private *priv) static int orinoco_tmd_cor_reset(struct orinoco_private *priv)
{ {
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
struct orinoco_pci_card *card = priv->card; struct orinoco_pci_card *card = priv->card;
unsigned long timeout; unsigned long timeout;
u16 reg; u16 reg;

17
drivers/net/wireless/orinoco/orinoco_usb.c
View File

@ -959,7 +959,7 @@ static int ezusb_access_ltv(struct ezusb_priv *upriv,
return retval; return retval;
} }
static int ezusb_write_ltv(hermes_t *hw, int bap, u16 rid, static int ezusb_write_ltv(struct hermes *hw, int bap, u16 rid,
u16 length, const void *data) u16 length, const void *data)
{ {
struct ezusb_priv *upriv = hw->priv; struct ezusb_priv *upriv = hw->priv;
@ -989,7 +989,7 @@ static int ezusb_write_ltv(hermes_t *hw, int bap, u16 rid,
NULL, 0, NULL); NULL, 0, NULL);
} }
static int ezusb_read_ltv(hermes_t *hw, int bap, u16 rid, static int ezusb_read_ltv(struct hermes *hw, int bap, u16 rid,
unsigned bufsize, u16 *length, void *buf) unsigned bufsize, u16 *length, void *buf)
{ {
struct ezusb_priv *upriv = hw->priv; struct ezusb_priv *upriv = hw->priv;
@ -1006,7 +1006,7 @@ static int ezusb_read_ltv(hermes_t *hw, int bap, u16 rid,
buf, bufsize, length); buf, bufsize, length);
} }
static int ezusb_doicmd_wait(hermes_t *hw, u16 cmd, u16 parm0, u16 parm1, static int ezusb_doicmd_wait(struct hermes *hw, u16 cmd, u16 parm0, u16 parm1,
u16 parm2, struct hermes_response *resp) u16 parm2, struct hermes_response *resp)
{ {
struct ezusb_priv *upriv = hw->priv; struct ezusb_priv *upriv = hw->priv;
@ -1028,7 +1028,7 @@ static int ezusb_doicmd_wait(hermes_t *hw, u16 cmd, u16 parm0, u16 parm1,
EZUSB_FRAME_CONTROL, NULL, 0, NULL); EZUSB_FRAME_CONTROL, NULL, 0, NULL);
} }
static int ezusb_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0, static int ezusb_docmd_wait(struct hermes *hw, u16 cmd, u16 parm0,
struct hermes_response *resp) struct hermes_response *resp)
{ {
struct ezusb_priv *upriv = hw->priv; struct ezusb_priv *upriv = hw->priv;
@ -1356,7 +1356,7 @@ static int ezusb_hard_reset(struct orinoco_private *priv)
} }
static int ezusb_init(hermes_t *hw) static int ezusb_init(struct hermes *hw)
{ {
struct ezusb_priv *upriv = hw->priv; struct ezusb_priv *upriv = hw->priv;
int retval; int retval;
@ -1438,7 +1438,7 @@ static void ezusb_bulk_in_callback(struct urb *urb)
} else if (upriv->dev) { } else if (upriv->dev) {
struct net_device *dev = upriv->dev; struct net_device *dev = upriv->dev;
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
if (hermes_rid == EZUSB_RID_RX) { if (hermes_rid == EZUSB_RID_RX) {
__orinoco_ev_rx(dev, hw); __orinoco_ev_rx(dev, hw);
@ -1575,7 +1575,7 @@ static int ezusb_probe(struct usb_interface *interface,
{ {
struct usb_device *udev = interface_to_usbdev(interface); struct usb_device *udev = interface_to_usbdev(interface);
struct orinoco_private *priv; struct orinoco_private *priv;
hermes_t *hw; struct hermes *hw;
struct ezusb_priv *upriv = NULL; struct ezusb_priv *upriv = NULL;
struct usb_interface_descriptor *iface_desc; struct usb_interface_descriptor *iface_desc;
struct usb_endpoint_descriptor *ep; struct usb_endpoint_descriptor *ep;
@ -1787,6 +1787,5 @@ module_init(ezusb_module_init);
module_exit(ezusb_module_exit); module_exit(ezusb_module_exit);
MODULE_AUTHOR("Manuel Estrada Sainz"); MODULE_AUTHOR("Manuel Estrada Sainz");
MODULE_DESCRIPTION MODULE_DESCRIPTION("Driver for Orinoco wireless LAN cards using EZUSB bridge");
("Driver for Orinoco wireless LAN cards using EZUSB bridge");
MODULE_LICENSE("Dual MPL/GPL"); MODULE_LICENSE("Dual MPL/GPL");

2
drivers/net/wireless/orinoco/spectrum_cs.c
View File

@ -197,7 +197,7 @@ static int
spectrum_cs_config(struct pcmcia_device *link) spectrum_cs_config(struct pcmcia_device *link)
{ {
struct orinoco_private *priv = link->priv; struct orinoco_private *priv = link->priv;
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int ret; int ret;
void __iomem *mem; void __iomem *mem;

12
drivers/net/wireless/orinoco/wext.c
View File

@ -87,7 +87,7 @@ nomem:
static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev) static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
struct iw_statistics *wstats = &priv->wstats; struct iw_statistics *wstats = &priv->wstats;
int err; int err;
unsigned long flags; unsigned long flags;
@ -457,7 +457,7 @@ static int orinoco_ioctl_setfreq(struct net_device *dev,
priv->channel = chan; priv->channel = chan;
if (priv->iw_mode == NL80211_IFTYPE_MONITOR) { if (priv->iw_mode == NL80211_IFTYPE_MONITOR) {
/* Fast channel change - no commit if successful */ /* Fast channel change - no commit if successful */
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST | err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST |
HERMES_TEST_SET_CHANNEL, HERMES_TEST_SET_CHANNEL,
chan, NULL); chan, NULL);
@ -492,7 +492,7 @@ static int orinoco_ioctl_getsens(struct net_device *dev,
char *extra) char *extra)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
u16 val; u16 val;
int err; int err;
unsigned long flags; unsigned long flags;
@ -668,7 +668,7 @@ static int orinoco_ioctl_getpower(struct net_device *dev,
char *extra) char *extra)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err = 0; int err = 0;
u16 enable, period, timeout, mcast; u16 enable, period, timeout, mcast;
unsigned long flags; unsigned long flags;
@ -873,7 +873,7 @@ static int orinoco_ioctl_set_auth(struct net_device *dev,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
struct iw_param *param = &wrqu->param; struct iw_param *param = &wrqu->param;
unsigned long flags; unsigned long flags;
int ret = -EINPROGRESS; int ret = -EINPROGRESS;
@ -1269,7 +1269,7 @@ static int orinoco_ioctl_getrid(struct net_device *dev,
char *extra) char *extra)
{ {
struct orinoco_private *priv = ndev_priv(dev); struct orinoco_private *priv = ndev_priv(dev);
hermes_t *hw = &priv->hw; struct hermes *hw = &priv->hw;
int rid = data->flags; int rid = data->flags;
u16 length; u16 length;
int err; int err;