aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/atmel.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/atmel.c')
-rw-r--r--drivers/net/wireless/atmel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 1fe41af81a59..9183f1cf89a7 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -2598,11 +2598,11 @@ static const iw_handler atmel_private_handler[] =
2598 NULL, /* SIOCIWFIRSTPRIV */ 2598 NULL, /* SIOCIWFIRSTPRIV */
2599}; 2599};
2600 2600
2601typedef struct atmel_priv_ioctl { 2601struct atmel_priv_ioctl {
2602 char id[32]; 2602 char id[32];
2603 unsigned char __user *data; 2603 unsigned char __user *data;
2604 unsigned short len; 2604 unsigned short len;
2605} atmel_priv_ioctl; 2605};
2606 2606
2607#define ATMELFWL SIOCIWFIRSTPRIV 2607#define ATMELFWL SIOCIWFIRSTPRIV
2608#define ATMELIDIFC ATMELFWL + 1 2608#define ATMELIDIFC ATMELFWL + 1
@@ -2615,7 +2615,7 @@ static const struct iw_priv_args atmel_private_args[] = {
2615 .cmd = ATMELFWL, 2615 .cmd = ATMELFWL,
2616 .set_args = IW_PRIV_TYPE_BYTE 2616 .set_args = IW_PRIV_TYPE_BYTE
2617 | IW_PRIV_SIZE_FIXED 2617 | IW_PRIV_SIZE_FIXED
2618 | sizeof (atmel_priv_ioctl), 2618 | sizeof(struct atmel_priv_ioctl),
2619 .get_args = IW_PRIV_TYPE_NONE, 2619 .get_args = IW_PRIV_TYPE_NONE,
2620 .name = "atmelfwl" 2620 .name = "atmelfwl"
2621 }, { 2621 }, {
@@ -2645,7 +2645,7 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
2645{ 2645{
2646 int i, rc = 0; 2646 int i, rc = 0;
2647 struct atmel_private *priv = netdev_priv(dev); 2647 struct atmel_private *priv = netdev_priv(dev);
2648 atmel_priv_ioctl com; 2648 struct atmel_priv_ioctl com;
2649 struct iwreq *wrq = (struct iwreq *) rq; 2649 struct iwreq *wrq = (struct iwreq *) rq;
2650 unsigned char *new_firmware; 2650 unsigned char *new_firmware;
2651 char domain[REGDOMAINSZ + 1]; 2651 char domain[REGDOMAINSZ + 1];