[PATCH] Call private data (at76_priv) "priv", not "dev", the later is ambiguous

Signed-off-by: Pavel Roskin <proski@gnu.org>

2 files changed, 1296 insertions, 1296 deletions

diff --git a/at76_usb.c b/at76_usb.c
index 4659060..b66536d 100644
--- a/at76_usb.c
+++ b/at76_usb.c
@@ -534,21 +534,21 @@ static inline int at76_is_cloaked_ssid(u8 *ssid, int length)
 }
 
 
-static inline void at76_free_bss_list(struct at76_priv *dev)
+static inline void at76_free_bss_list(struct at76_priv *priv)
 {
 	struct list_head *next, *ptr;
 	unsigned long flags;
 
-	spin_lock_irqsave(&dev->bss_list_spinlock, flags);
+	spin_lock_irqsave(&priv->bss_list_spinlock, flags);
 
-	dev->curr_bss = dev->new_bss = NULL;
+	priv->curr_bss = priv->new_bss = NULL;
 
-	list_for_each_safe(ptr, next, &dev->bss_list) {
+	list_for_each_safe(ptr, next, &priv->bss_list) {
 		list_del(ptr);
 		kfree(list_entry(ptr, struct bss_info, list));
 	}
 
-	spin_unlock_irqrestore(&dev->bss_list_spinlock, flags);
+	spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
 }
 
 
@@ -649,10 +649,10 @@ static inline int get_hw_cfg_intersil(struct usb_device *udev,
 
 
 /* Get the hardware configuration for the adapter and place the appropriate
- * data in the appropriate fields of 'dev' (the GetHWConfig request and
+ * data in the appropriate fields of 'priv' (the GetHWConfig request and
  * interpretation of the result depends on the type of board we're dealing
  * with) */
-static int at76_get_hw_config(struct at76_priv *dev)
+static int at76_get_hw_config(struct at76_priv *priv)
 {
 	int ret;
 	union at76_hwcfg *hwcfg = kmalloc(sizeof(*hwcfg), GFP_KERNEL);
@@ -660,39 +660,39 @@ static int at76_get_hw_config(struct at76_priv *dev)
 	if (!hwcfg)
 		return -ENOMEM;
 
-	switch (dev->board_type) {
+	switch (priv->board_type) {
 
 	case BOARDTYPE_503_INTERSIL_3861:
 	case BOARDTYPE_503_INTERSIL_3863:
-		ret = get_hw_cfg_intersil(dev->udev, hwcfg, sizeof(hwcfg->i));
+		ret = get_hw_cfg_intersil(priv->udev, hwcfg, sizeof(hwcfg->i));
 		if (ret < 0)
 			break;
-		memcpy(dev->mac_addr, hwcfg->i.mac_addr, ETH_ALEN);
-		dev->regulatory_domain = hwcfg->i.regulatory_domain;
+		memcpy(priv->mac_addr, hwcfg->i.mac_addr, ETH_ALEN);
+		priv->regulatory_domain = hwcfg->i.regulatory_domain;
 		break;
 
 	case BOARDTYPE_503_RFMD:
 	case BOARDTYPE_503_RFMD_ACC:
-		ret = at76_get_hw_cfg_rfmd(dev->udev, hwcfg, sizeof(hwcfg->r3));
+		ret = at76_get_hw_cfg_rfmd(priv->udev, hwcfg, sizeof(hwcfg->r3));
 		if (ret < 0)
 			break;
-		memcpy(dev->mac_addr, hwcfg->r3.mac_addr, ETH_ALEN);
-		dev->regulatory_domain = hwcfg->r3.regulatory_domain;
+		memcpy(priv->mac_addr, hwcfg->r3.mac_addr, ETH_ALEN);
+		priv->regulatory_domain = hwcfg->r3.regulatory_domain;
 		break;
 
 	case BOARDTYPE_505_RFMD:
 	case BOARDTYPE_505_RFMD_2958:
 	case BOARDTYPE_505A_RFMD_2958:
-		ret = at76_get_hw_cfg_rfmd(dev->udev, hwcfg, sizeof(hwcfg->r5));
+		ret = at76_get_hw_cfg_rfmd(priv->udev, hwcfg, sizeof(hwcfg->r5));
 		if (ret < 0)
 			break;
-		memcpy(dev->mac_addr, hwcfg->r5.mac_addr, ETH_ALEN);
-		dev->regulatory_domain = hwcfg->r5.regulatory_domain;
+		memcpy(priv->mac_addr, hwcfg->r5.mac_addr, ETH_ALEN);
+		priv->regulatory_domain = hwcfg->r5.regulatory_domain;
 		break;
 
 	default:
 		err("Bad board type set (%d).  Unable to get hardware config.",
-		    dev->board_type);
+		    priv->board_type);
 		ret = -EINVAL;
 	}
 
@@ -851,13 +851,13 @@ static const char *at76_get_cmd_status_string(u8 cmd_status)
 
 
 /* TODO: should timeout */
-static int at76_wait_completion(struct at76_priv *dev, int cmd)
+static int at76_wait_completion(struct at76_priv *priv, int cmd)
 {
-	struct net_device *netdev = dev->netdev;
+	struct net_device *netdev = priv->netdev;
 	int status = 0;
 
 	do {
-		status = at76_get_cmd_status(dev->udev, cmd);
+		status = at76_get_cmd_status(priv->udev, cmd);
 		if (status < 0) {
 			err("%s: at76_get_cmd_status failed: %d", netdev->name, status);
 			break;
@@ -865,7 +865,7 @@ static int at76_wait_completion(struct at76_priv *dev, int cmd)
 
 		at76_dbg(DBG_WAIT_COMPLETE,
 		         "%s: Waiting on cmd %d, status = %d (%s)",
-		         dev->netdev->name, cmd, status,
+		         priv->netdev->name, cmd, status,
 		         at76_get_cmd_status_string(status));
 
 		if (status == CMD_STATUS_IN_PROGRESS ||
@@ -880,9 +880,9 @@ static int at76_wait_completion(struct at76_priv *dev, int cmd)
 }
 
 
-static int at76_set_mib(struct at76_priv *dev, struct set_mib_buffer *buf)
+static int at76_set_mib(struct at76_priv *priv, struct set_mib_buffer *buf)
 {
-	struct usb_device *udev = dev->udev;
+	struct usb_device *udev = priv->udev;
 	int ret;
 	struct at76_command *cmd_buf = kmalloc(sizeof(struct at76_command) +
 					       buf->size + 4, GFP_KERNEL);
@@ -899,9 +899,9 @@ static int at76_set_mib(struct at76_priv *dev, struct set_mib_buffer *buf)
 				      sizeof(struct at76_command) +
 				      buf->size + 4, USB_CTRL_GET_TIMEOUT);
 		if (ret >= 0)
-			if ((ret = at76_wait_completion(dev, CMD_SET_MIB)) !=
+			if ((ret = at76_wait_completion(priv, CMD_SET_MIB)) !=
 			    CMD_STATUS_COMPLETE) {
-				info("%s: set_mib: at76_wait_completion failed with %d", dev->netdev->name, ret);
+				info("%s: set_mib: at76_wait_completion failed with %d", priv->netdev->name, ret);
 				ret = -EIO;
 			}
 		kfree(cmd_buf);
@@ -914,17 +914,17 @@ static int at76_set_mib(struct at76_priv *dev, struct set_mib_buffer *buf)
 
 
 /* return < 0 on error, == 0 if no command sent, == 1 if cmd sent */
-static int at76_set_radio(struct at76_priv *dev, int on_off)
+static int at76_set_radio(struct at76_priv *priv, int on_off)
 {
 	int ret;
 
-	if (dev->radio_on != on_off) {
-		ret = at76_set_card_command(dev->udev, CMD_RADIO, NULL, 0);
+	if (priv->radio_on != on_off) {
+		ret = at76_set_card_command(priv->udev, CMD_RADIO, NULL, 0);
 		if (ret < 0) {
-			err("%s: at76_set_card_command(CMD_RADIO) failed: %d", dev->netdev->name, ret);
+			err("%s: at76_set_card_command(CMD_RADIO) failed: %d", priv->netdev->name, ret);
 		} else
 			ret = 1;
-		dev->radio_on = on_off;
+		priv->radio_on = on_off;
 	} else
 		ret = 0;
 	return ret;
@@ -935,41 +935,41 @@ static int at76_set_radio(struct at76_priv *dev, int on_off)
  * set_pm_mode - set current power save mode
  * (AT76_PM_OFF/AT76_PM_ON/AT76_PM_SMART)
  */
-static int at76_set_pm_mode(struct at76_priv *dev)
+static int at76_set_pm_mode(struct at76_priv *priv)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC_MGMT;
-	dev->mib_buf.size = 1;
-	dev->mib_buf.index = POWER_MGMT_MODE_OFFSET;
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC_MGMT;
+	priv->mib_buf.size = 1;
+	priv->mib_buf.index = POWER_MGMT_MODE_OFFSET;
 
-	dev->mib_buf.data[0] = dev->pm_mode;
+	priv->mib_buf.data[0] = priv->pm_mode;
 
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
-		err("%s: set_mib (pm_mode) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (pm_mode) failed: %d", priv->netdev->name, ret);
 	}
 	return ret;
 }
 
 
 /* sets the assoc id for power save mode */
-static int at76_set_associd(struct at76_priv *dev, u16 id)
+static int at76_set_associd(struct at76_priv *priv, u16 id)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC_MGMT;
-	dev->mib_buf.size = 2;
-	dev->mib_buf.index = STATION_ID_OFFSET;
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC_MGMT;
+	priv->mib_buf.size = 2;
+	priv->mib_buf.index = STATION_ID_OFFSET;
 
-	dev->mib_buf.data[0] = id & 0xff;
-	dev->mib_buf.data[1] = id >> 8;
+	priv->mib_buf.data[0] = id & 0xff;
+	priv->mib_buf.data[1] = id >> 8;
 
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
-		err("%s: set_mib (associd) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (associd) failed: %d", priv->netdev->name, ret);
 	}
 	return ret;
 }
@@ -977,108 +977,108 @@ static int at76_set_associd(struct at76_priv *dev, u16 id)
 
 /* sets the listen interval for power save mode.
    really needed, as we have a similar parameter in the assocreq ??? */
-static int at76_set_listen_interval(struct at76_priv *dev, u16 interval)
+static int at76_set_listen_interval(struct at76_priv *priv, u16 interval)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC;
-	dev->mib_buf.size = 2;
-	dev->mib_buf.index = STATION_ID_OFFSET;
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC;
+	priv->mib_buf.size = 2;
+	priv->mib_buf.index = STATION_ID_OFFSET;
 
-	dev->mib_buf.data[0] = interval & 0xff;
-	dev->mib_buf.data[1] = interval >> 8;
+	priv->mib_buf.data[0] = interval & 0xff;
+	priv->mib_buf.data[1] = interval >> 8;
 
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
 		err("%s: set_mib (listen_interval) failed: %d",
-		    dev->netdev->name, ret);
+		    priv->netdev->name, ret);
 	}
 	return ret;
 }
 
 
-static int at76_set_preamble(struct at76_priv *dev, u8 type)
+static int at76_set_preamble(struct at76_priv *priv, u8 type)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_LOCAL;
-	dev->mib_buf.size = 1;
-	dev->mib_buf.index = PREAMBLE_TYPE_OFFSET;
-	dev->mib_buf.data[0] = type;
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_LOCAL;
+	priv->mib_buf.size = 1;
+	priv->mib_buf.index = PREAMBLE_TYPE_OFFSET;
+	priv->mib_buf.data[0] = type;
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
-		err("%s: set_mib (preamble) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (preamble) failed: %d", priv->netdev->name, ret);
 	}
 	return ret;
 }
 
 
-static int at76_set_frag(struct at76_priv *dev, u16 size)
+static int at76_set_frag(struct at76_priv *priv, u16 size)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC;
-	dev->mib_buf.size = 2;
-	dev->mib_buf.index = FRAGMENTATION_OFFSET;
-	*(__le16 *) dev->mib_buf.data = cpu_to_le16(size);
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC;
+	priv->mib_buf.size = 2;
+	priv->mib_buf.index = FRAGMENTATION_OFFSET;
+	*(__le16 *) priv->mib_buf.data = cpu_to_le16(size);
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
-		err("%s: set_mib (frag threshold) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (frag threshold) failed: %d", priv->netdev->name, ret);
 	}
 	return ret;
 }
 
 
-static int at76_set_rts(struct at76_priv *dev, u16 size)
+static int at76_set_rts(struct at76_priv *priv, u16 size)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC;
-	dev->mib_buf.size = 2;
-	dev->mib_buf.index = RTS_OFFSET;
-	*(__le16 *) dev->mib_buf.data = cpu_to_le16(size);
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC;
+	priv->mib_buf.size = 2;
+	priv->mib_buf.index = RTS_OFFSET;
+	*(__le16 *) priv->mib_buf.data = cpu_to_le16(size);
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
-		err("%s: set_mib (rts) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (rts) failed: %d", priv->netdev->name, ret);
 	}
 	return ret;
 }
 
 
-static int at76_set_autorate_fallback(struct at76_priv *dev, int onoff)
+static int at76_set_autorate_fallback(struct at76_priv *priv, int onoff)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_LOCAL;
-	dev->mib_buf.size = 1;
-	dev->mib_buf.index = TX_AUTORATE_FALLBACK_OFFSET;
-	dev->mib_buf.data[0] = onoff;
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_LOCAL;
+	priv->mib_buf.size = 1;
+	priv->mib_buf.index = TX_AUTORATE_FALLBACK_OFFSET;
+	priv->mib_buf.data[0] = onoff;
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
-		err("%s: set_mib (autorate fallback) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (autorate fallback) failed: %d", priv->netdev->name, ret);
 	}
 	return ret;
 }
 
 
-static int at76_add_mac_address(struct at76_priv *dev, void *addr)
+static int at76_add_mac_address(struct at76_priv *priv, void *addr)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC_ADD;
-	dev->mib_buf.size = ETH_ALEN;
-	dev->mib_buf.index = offsetof(struct mib_mac_addr, mac_addr);
-	memcpy(dev->mib_buf.data, addr, ETH_ALEN);
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC_ADD;
+	priv->mib_buf.size = ETH_ALEN;
+	priv->mib_buf.index = offsetof(struct mib_mac_addr, mac_addr);
+	memcpy(priv->mib_buf.data, addr, ETH_ALEN);
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
 		err("%s: set_mib (MAC_ADDR, mac_addr) failed: %d",
-		    dev->netdev->name, ret);
+		    priv->netdev->name, ret);
 	}
 	return ret;
 }
@@ -1087,33 +1087,33 @@ static int at76_add_mac_address(struct at76_priv *dev, void *addr)
 #if 0
 /* implemented to get promisc. mode working, but does not help.
    May still be useful for multicast eventually. */
-static int set_group_address(struct at76_priv *dev, u8 *addr, int n)
+static int set_group_address(struct at76_priv *priv, u8 *addr, int n)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC_ADD;
-	dev->mib_buf.size = ETH_ALEN;
-	dev->mib_buf.index =
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC_ADD;
+	priv->mib_buf.size = ETH_ALEN;
+	priv->mib_buf.index =
 	    offsetof(struct mib_mac_addr, group_addr) + n * ETH_ALEN;
-	memcpy(dev->mib_buf.data, addr, ETH_ALEN);
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memcpy(priv->mib_buf.data, addr, ETH_ALEN);
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
 		err("%s: set_mib (MIB_MAC_ADD, group_addr) failed: %d",
-		    dev->netdev->name, ret);
+		    priv->netdev->name, ret);
 	}
 #if 1
 	/* I do not know anything about the group_addr_status field... (oku) */
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC_ADD;
-	dev->mib_buf.size = 1;
-	dev->mib_buf.index =
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC_ADD;
+	priv->mib_buf.size = 1;
+	priv->mib_buf.index =
 	    offsetof(struct mib_mac_addr, group_addr_status) + n;
-	dev->mib_buf.data[0] = 1;
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	priv->mib_buf.data[0] = 1;
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
 		err("%s: set_mib (MIB_MAC_ADD, group_addr_status) failed: %d",
-		    dev->netdev->name, ret);
+		    priv->netdev->name, ret);
 	}
 #endif
 	return ret;
@@ -1121,7 +1121,7 @@ static int set_group_address(struct at76_priv *dev, u8 *addr, int n)
 #endif
 
 
-static int at76_dump_mib_mac_addr(struct at76_priv *dev)
+static int at76_dump_mib_mac_addr(struct at76_priv *priv)
 {
 	int ret = 0;
 	struct mib_mac_addr *mac_addr =
@@ -1132,19 +1132,19 @@ static int at76_dump_mib_mac_addr(struct at76_priv *dev)
 		goto exit;
 	}
 
-	ret = at76_get_mib(dev->udev, MIB_MAC_ADD,
+	ret = at76_get_mib(priv->udev, MIB_MAC_ADD,
 			   mac_addr, sizeof(struct mib_mac_addr));
 	if (ret < 0) {
-		err("%s: at76_get_mib (MAC_ADDR) failed: %d", dev->netdev->name,
+		err("%s: at76_get_mib (MAC_ADDR) failed: %d", priv->netdev->name,
 		    ret);
 		goto err;
 	}
 
 	dbg("%s: MIB MAC_ADDR: mac_addr %s res 0x%x 0x%x group_addr %s status %d %d %d %d",
-	       dev->netdev->name, mac2str(mac_addr->mac_addr),
+	       priv->netdev->name, mac2str(mac_addr->mac_addr),
 		   mac_addr->res[0], mac_addr->res[1],
-	       hex2str(dev->obuf, mac_addr->group_addr,
-		       min((int)(sizeof(dev->obuf)-1)/2, 4*ETH_ALEN), '\0'),
+	       hex2str(priv->obuf, mac_addr->group_addr,
+		       min((int)(sizeof(priv->obuf)-1)/2, 4*ETH_ALEN), '\0'),
 	       mac_addr->group_addr_status[0], mac_addr->group_addr_status[1],
 	       mac_addr->group_addr_status[2], mac_addr->group_addr_status[3]);
 
@@ -1155,7 +1155,7 @@ static int at76_dump_mib_mac_addr(struct at76_priv *dev)
 }
 
 
-static int at76_dump_mib_mac_wep(struct at76_priv *dev)
+static int at76_dump_mib_mac_wep(struct at76_priv *priv)
 {
 	int ret = 0;
 	struct mib_mac_wep *mac_wep =
@@ -1165,28 +1165,28 @@ static int at76_dump_mib_mac_wep(struct at76_priv *dev)
 		ret = -ENOMEM;
 		goto exit;
 	}
-	ret = at76_get_mib(dev->udev, MIB_MAC_WEP, mac_wep,
+	ret = at76_get_mib(priv->udev, MIB_MAC_WEP, mac_wep,
 			   sizeof(struct mib_mac_wep));
 	if (ret < 0) {
-		err("%s: at76_get_mib (MAC_WEP) failed: %d", dev->netdev->name, ret);
+		err("%s: at76_get_mib (MAC_WEP) failed: %d", priv->netdev->name, ret);
 		goto err;
 	}
 
 	dbg("%s: MIB MAC_WEP: priv_invoked %u def_key_id %u key_len %u "
 	       "excl_unencr %u wep_icv_err %u wep_excluded %u encr_level %u key %d: %s",
-	       dev->netdev->name, mac_wep->privacy_invoked,
+	       priv->netdev->name, mac_wep->privacy_invoked,
 	       mac_wep->wep_default_key_id, mac_wep->wep_key_mapping_len,
 	       mac_wep->exclude_unencrypted,
 	       le32_to_cpu(mac_wep->wep_icv_error_count),
 	       le32_to_cpu(mac_wep->wep_excluded_count),
 	       mac_wep->encryption_level, mac_wep->wep_default_key_id,
-	       mac_wep->wep_default_key_id < 4 ? hex2str(dev->obuf,
+	       mac_wep->wep_default_key_id < 4 ? hex2str(priv->obuf,
 							 mac_wep->
 							 wep_default_keyvalue
 							 [mac_wep->
 							  wep_default_key_id],
 							 min((int)
-							     (sizeof(dev->obuf)
+							     (sizeof(priv->obuf)
 							      - 1) / 2,
 							     mac_wep->
 							     encryption_level ==
@@ -1201,7 +1201,7 @@ static int at76_dump_mib_mac_wep(struct at76_priv *dev)
 }
 
 
-static int at76_dump_mib_mac_mgmt(struct at76_priv *dev)
+static int at76_dump_mib_mac_mgmt(struct at76_priv *priv)
 {
 	int ret = 0;
 	struct mib_mac_mgmt *mac_mgmt =
@@ -1212,10 +1212,10 @@ static int at76_dump_mib_mac_mgmt(struct at76_priv *dev)
 		ret = -ENOMEM;
 		goto exit;
 	}
-	ret = at76_get_mib(dev->udev, MIB_MAC_MGMT, mac_mgmt,
+	ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, mac_mgmt,
 			   sizeof(struct mib_mac_mgmt));
 	if (ret < 0) {
-		err("%s: at76_get_mib failed: %d", dev->netdev->name, ret);
+		err("%s: at76_get_mib failed: %d", priv->netdev->name, ret);
 		goto err;
 	}
 
@@ -1229,7 +1229,7 @@ static int at76_dump_mib_mac_mgmt(struct at76_priv *dev)
 	       "pm_mode %d ibss_change %d res %d "
 	       "multi_domain_capability_implemented %d "
 	       "international_roaming %d country_string %s",
-	       dev->netdev->name,
+	       priv->netdev->name,
 	       le16_to_cpu(mac_mgmt->beacon_period),
 	       le16_to_cpu(mac_mgmt->CFP_max_duration),
 	       le16_to_cpu(mac_mgmt->medium_occupancy_limit),
@@ -1240,8 +1240,8 @@ static int at76_dump_mib_mac_mgmt(struct at76_priv *dev)
 	       mac_mgmt->DTIM_period,
 	       mac_mgmt->CFP_period,
 	       mac2str(mac_mgmt->current_bssid),
-	       hex2str(dev->obuf, mac_mgmt->current_essid,
-		       min((int)(sizeof(dev->obuf) - 1) / 2,
+	       hex2str(priv->obuf, mac_mgmt->current_essid,
+		       min((int)(sizeof(priv->obuf) - 1) / 2,
 			   IW_ESSID_MAX_SIZE), '\0'),
 	       mac_mgmt->current_bss_type,
 	       mac_mgmt->power_mgmt_mode,
@@ -1257,7 +1257,7 @@ static int at76_dump_mib_mac_mgmt(struct at76_priv *dev)
 }
 
 
-static int at76_dump_mib_mac(struct at76_priv *dev)
+static int at76_dump_mib_mac(struct at76_priv *priv)
 {
 	int ret = 0;
 	struct mib_mac *mac = kmalloc(sizeof(struct mib_mac), GFP_KERNEL);
@@ -1267,9 +1267,9 @@ static int at76_dump_mib_mac(struct at76_priv *dev)
 		goto exit;
 	}
 
-	ret = at76_get_mib(dev->udev, MIB_MAC, mac, sizeof(struct mib_mac));
+	ret = at76_get_mib(priv->udev, MIB_MAC, mac, sizeof(struct mib_mac));
 	if (ret < 0) {
-		err("%s: at76_get_mib failed: %d", dev->netdev->name, ret);
+		err("%s: at76_get_mib failed: %d", priv->netdev->name, ret);
 		goto err;
 	}
 
@@ -1279,7 +1279,7 @@ static int at76_dump_mib_mac(struct at76_priv *dev)
 	       "scan_channel %d probe_delay %u min_channel_time %d "
 	       "max_channel_time %d listen_int %d desired_ssid %s "
 	       "desired_bssid %s desired_bsstype %d",
-	       dev->netdev->name,
+	       priv->netdev->name,
 	       le32_to_cpu(mac->max_tx_msdu_lifetime),
 	       le32_to_cpu(mac->max_rx_lifetime),
 	       le16_to_cpu(mac->frag_threshold),
@@ -1294,8 +1294,8 @@ static int at76_dump_mib_mac(struct at76_priv *dev)
 	       le16_to_cpu(mac->min_channel_time),
 	       le16_to_cpu(mac->max_channel_time),
 	       le16_to_cpu(mac->listen_interval),
-	       hex2str(dev->obuf, mac->desired_ssid,
-		       min((int)(sizeof(dev->obuf) - 1) / 2,
+	       hex2str(priv->obuf, mac->desired_ssid,
+		       min((int)(sizeof(priv->obuf) - 1) / 2,
 			   IW_ESSID_MAX_SIZE), '\0'),
 	       mac2str(mac->desired_bssid), mac->desired_bsstype);
       err:
@@ -1305,7 +1305,7 @@ static int at76_dump_mib_mac(struct at76_priv *dev)
 }
 
 
-static int at76_dump_mib_phy(struct at76_priv *dev)
+static int at76_dump_mib_phy(struct at76_priv *priv)
 {
 	int ret = 0;
 	struct mib_phy *phy = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);
@@ -1315,9 +1315,9 @@ static int at76_dump_mib_phy(struct at76_priv *dev)
 		goto exit;
 	}
 
-	ret = at76_get_mib(dev->udev, MIB_PHY, phy, sizeof(struct mib_phy));
+	ret = at76_get_mib(priv->udev, MIB_PHY, phy, sizeof(struct mib_phy));
 	if (ret < 0) {
-		err("%s: at76_get_mib failed: %d", dev->netdev->name, ret);
+		err("%s: at76_get_mib failed: %d", priv->netdev->name, ret);
 		goto err;
 	}
 
@@ -1326,7 +1326,7 @@ static int at76_dump_mib_phy(struct at76_priv *dev)
 	       "cca_mode_supported %d operation_rate_set "
 	       "0x%x 0x%x 0x%x 0x%x channel_id %d current_cca_mode %d "
 	       "phy_type %d current_reg_domain %d",
-	       dev->netdev->name,
+	       priv->netdev->name,
 	       le32_to_cpu(phy->ed_threshold),
 	       le16_to_cpu(phy->slot_time),
 	       le16_to_cpu(phy->sifs_time),
@@ -1345,7 +1345,7 @@ static int at76_dump_mib_phy(struct at76_priv *dev)
 }
 
 
-static int at76_dump_mib_local(struct at76_priv *dev)
+static int at76_dump_mib_local(struct at76_priv *priv)
 {
 	int ret = 0;
 	struct mib_local *local = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);
@@ -1355,16 +1355,16 @@ static int at76_dump_mib_local(struct at76_priv *dev)
 		goto exit;
 	}
 
-	ret = at76_get_mib(dev->udev, MIB_LOCAL, local,
+	ret = at76_get_mib(priv->udev, MIB_LOCAL, local,
 			   sizeof(struct mib_local));
 	if (ret < 0) {
-		err("%s: at76_get_mib failed: %d", dev->netdev->name, ret);
+		err("%s: at76_get_mib failed: %d", priv->netdev->name, ret);
 		goto err;
 	}
 
 	dbg("%s: MIB PHY: beacon_enable %d txautorate_fallback %d "
 	       "ssid_size %d promiscuous_mode %d preamble_type %d",
-	       dev->netdev->name,
+	       priv->netdev->name,
 	       local->beacon_enable,
 	       local->txautorate_fallback,
 	       local->ssid_size, local->promiscuous_mode, local->preamble_type);
@@ -1375,7 +1375,7 @@ static int at76_dump_mib_local(struct at76_priv *dev)
 }
 
 
-static int at76_get_mib_mdomain(struct at76_priv *dev, struct mib_mdomain *val)
+static int at76_get_mib_mdomain(struct at76_priv *priv, struct mib_mdomain *val)
 {
 	int ret = 0;
 	struct mib_mdomain *mdomain =
@@ -1386,10 +1386,10 @@ static int at76_get_mib_mdomain(struct at76_priv *dev, struct mib_mdomain *val)
 		goto exit;
 	}
 
-	ret = at76_get_mib(dev->udev, MIB_MDOMAIN, mdomain,
+	ret = at76_get_mib(priv->udev, MIB_MDOMAIN, mdomain,
 			   sizeof(struct mib_mdomain));
 	if (ret < 0) {
-		err("%s: at76_get_mib failed: %d", dev->netdev->name, ret);
+		err("%s: at76_get_mib failed: %d", priv->netdev->name, ret);
 		goto err;
 	}
 
@@ -1402,20 +1402,20 @@ static int at76_get_mib_mdomain(struct at76_priv *dev, struct mib_mdomain *val)
 }
 
 
-static void at76_dump_mib_mdomain(struct at76_priv *dev)
+static void at76_dump_mib_mdomain(struct at76_priv *priv)
 {
 	char obuf1[2*14+1], obuf2[2*14+1]; /* to hexdump tx_powerlevel,
 					      channel_list */
 	int ret;
 	struct mib_mdomain mdomain;
 
-	if ((ret=at76_get_mib_mdomain(dev, &mdomain)) < 0) {
+	if ((ret=at76_get_mib_mdomain(priv, &mdomain)) < 0) {
 		err("%s: at76_get_mib_mdomain returned %d", __FUNCTION__, ret);
 		return;
 	}
 
 	at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %s tx_powerlevel %s",
-	         dev->netdev->name,
+	         priv->netdev->name,
 	         hex2str(obuf1, mdomain.channel_list,
 		         (sizeof(obuf1) - 1) / 2, '\0'),
 	         hex2str(obuf2, mdomain.tx_powerlevel,
@@ -1423,7 +1423,7 @@ static void at76_dump_mib_mdomain(struct at76_priv *dev)
 }
 
 
-static int at76_get_current_bssid(struct at76_priv *dev)
+static int at76_get_current_bssid(struct at76_priv *priv)
 {
 	int ret = 0;
 	struct mib_mac_mgmt *mac_mgmt =
@@ -1434,14 +1434,14 @@ static int at76_get_current_bssid(struct at76_priv *dev)
 		goto exit;
 	}
 
-	ret = at76_get_mib(dev->udev, MIB_MAC_MGMT, mac_mgmt,
+	ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, mac_mgmt,
 			   sizeof(struct mib_mac_mgmt));
 	if (ret < 0) {
-		err("%s: at76_get_mib failed: %d", dev->netdev->name, ret);
+		err("%s: at76_get_mib failed: %d", priv->netdev->name, ret);
 		goto err;
 	}
-	memcpy(dev->bssid, mac_mgmt->current_bssid, ETH_ALEN);
-	info("using BSSID %s", mac2str(dev->bssid));
+	memcpy(priv->bssid, mac_mgmt->current_bssid, ETH_ALEN);
+	info("using BSSID %s", mac2str(priv->bssid));
  err:
 	kfree(mac_mgmt);
  exit:
@@ -1449,7 +1449,7 @@ static int at76_get_current_bssid(struct at76_priv *dev)
 }
 
 
-static int at76_get_current_channel(struct at76_priv *dev)
+static int at76_get_current_channel(struct at76_priv *priv)
 {
 	int ret = 0;
 	struct mib_phy *phy = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);
@@ -1458,12 +1458,12 @@ static int at76_get_current_channel(struct at76_priv *dev)
 		ret = -ENOMEM;
 		goto exit;
 	}
-	ret = at76_get_mib(dev->udev, MIB_PHY, phy, sizeof(struct mib_phy));
+	ret = at76_get_mib(priv->udev, MIB_PHY, phy, sizeof(struct mib_phy));
 	if (ret < 0) {
-		err("%s: at76_get_mib(MIB_PHY) failed: %d", dev->netdev->name, ret);
+		err("%s: at76_get_mib(MIB_PHY) failed: %d", priv->netdev->name, ret);
 		goto err;
 	}
-	dev->channel = phy->channel_id;
+	priv->channel = phy->channel_id;
  err:
 	kfree(phy);
  exit:
@@ -1477,7 +1477,7 @@ static int at76_get_current_channel(struct at76_priv *dev)
  * @use_essid - use the configured ESSID in non passive mode
  * @ir_step - international roaming step (0, 1)
  */
-static int at76_start_scan(struct at76_priv *dev, int use_essid, int ir_step)
+static int at76_start_scan(struct at76_priv *priv, int use_essid, int ir_step)
 {
 	struct at76_start_scan scan;
 
@@ -1485,73 +1485,73 @@ static int at76_start_scan(struct at76_priv *dev, int use_essid, int ir_step)
 	memset(scan.bssid, 0xff, ETH_ALEN);
 
 	if (use_essid) {
-		memcpy(scan.essid, dev->essid, IW_ESSID_MAX_SIZE);
-		scan.essid_size = dev->essid_size;
+		memcpy(scan.essid, priv->essid, IW_ESSID_MAX_SIZE);
+		scan.essid_size = priv->essid_size;
 	} else
 		scan.essid_size = 0;
 
 	/* jal: why should we start at a certain channel? we do scan the whole range
 	   allowed by reg domain. */
-	scan.channel = dev->channel;
+	scan.channel = priv->channel;
 
 	/* atmelwlandriver differs between scan type 0 and 1 (active/passive)
 	   For ad-hoc mode, it uses type 0 only. */
-	if ((dev->international_roaming == IR_ON && ir_step == 0) ||
-	    dev->iw_mode == IW_MODE_MONITOR)
+	if ((priv->international_roaming == IR_ON && ir_step == 0) ||
+	    priv->iw_mode == IW_MODE_MONITOR)
 		scan.scan_type = SCAN_TYPE_PASSIVE;
 	else
-		scan.scan_type = dev->scan_mode;
+		scan.scan_type = priv->scan_mode;
 
 	/* INFO: For probe_delay, not multiplying by 1024 as this will be
 	   slightly less than min_channel_time
 	   (per spec: probe delay < min. channel time) */
-	if (dev->istate == MONITORING) {
-		scan.min_channel_time = cpu_to_le16(dev->monitor_scan_min_time);
-		scan.max_channel_time = cpu_to_le16(dev->monitor_scan_max_time);
-		scan.probe_delay = cpu_to_le16(dev->monitor_scan_min_time * 1000);
+	if (priv->istate == MONITORING) {
+		scan.min_channel_time = cpu_to_le16(priv->monitor_scan_min_time);
+		scan.max_channel_time = cpu_to_le16(priv->monitor_scan_max_time);
+		scan.probe_delay = cpu_to_le16(priv->monitor_scan_min_time * 1000);
 	} else {
-		scan.min_channel_time = cpu_to_le16(dev->scan_min_time);
-		scan.max_channel_time = cpu_to_le16(dev->scan_max_time);
-		scan.probe_delay = cpu_to_le16(dev->scan_min_time * 1000);
+		scan.min_channel_time = cpu_to_le16(priv->scan_min_time);
+		scan.max_channel_time = cpu_to_le16(priv->scan_max_time);
+		scan.probe_delay = cpu_to_le16(priv->scan_min_time * 1000);
 	}
-	if (dev->international_roaming == IR_ON && ir_step == 1)
+	if (priv->international_roaming == IR_ON && ir_step == 1)
 		scan.international_scan = 0;
 	else
-		scan.international_scan = dev->international_roaming;
+		scan.international_scan = priv->international_roaming;
 
 	/* other values are set to 0 for type 0 */
 
 	at76_dbg(DBG_PROGRESS, "%s: start_scan (use_essid = %d, intl = %d, "
 	         "channel = %d, probe_delay = %d, scan_min_time = %d, "
 	         "scan_max_time = %d)",
-	         dev->netdev->name, use_essid,
+	         priv->netdev->name, use_essid,
 	         scan.international_scan, scan.channel,
 	         le16_to_cpu(scan.probe_delay),
 	         le16_to_cpu(scan.min_channel_time),
 	         le16_to_cpu(scan.max_channel_time));
 
-	return at76_set_card_command(dev->udev, CMD_SCAN, &scan, sizeof(scan));
+	return at76_set_card_command(priv->udev, CMD_SCAN, &scan, sizeof(scan));
 }
 
 
-static int at76_start_ibss(struct at76_priv *dev)
+static int at76_start_ibss(struct at76_priv *priv)
 {
 	struct at76_start_bss bss;
 
 	memset(&bss, 0, sizeof(struct at76_start_bss));
 	memset(bss.bssid, 0xff, ETH_ALEN);
-	memcpy(bss.essid, dev->essid, IW_ESSID_MAX_SIZE);
-	bss.essid_size = dev->essid_size;
+	memcpy(bss.essid, priv->essid, IW_ESSID_MAX_SIZE);
+	bss.essid_size = priv->essid_size;
 	bss.bss_type = ADHOC_MODE;
-	bss.channel = dev->channel;
+	bss.channel = priv->channel;
 
-	return at76_set_card_command(dev->udev, CMD_START_IBSS, &bss,
+	return at76_set_card_command(priv->udev, CMD_START_IBSS, &bss,
 				     sizeof(struct at76_start_bss));
 }
 
 
-/* idx points into dev->bss */
-static int at76_join_bss(struct at76_priv *dev, struct bss_info *ptr)
+/* idx points into priv->bss */
+static int at76_join_bss(struct at76_priv *priv, struct bss_info *ptr)
 {
 	struct at76_join join;
 
@@ -1561,14 +1561,14 @@ static int at76_join_bss(struct at76_priv *dev, struct bss_info *ptr)
 	memcpy(join.bssid, ptr->bssid, ETH_ALEN);
 	memcpy(join.essid, ptr->ssid, ptr->ssid_len);
 	join.essid_size = ptr->ssid_len;
-	join.bss_type = (dev->iw_mode == IW_MODE_ADHOC ? 1 : 2);
+	join.bss_type = (priv->iw_mode == IW_MODE_ADHOC ? 1 : 2);
 	join.channel = ptr->channel;
 	join.timeout = cpu_to_le16(2000);
 
 	at76_dbg(DBG_PROGRESS, "%s join addr %s ssid %s type %d ch %d timeout %d",
-	         dev->netdev->name, mac2str(join.bssid),
+	         priv->netdev->name, mac2str(join.bssid),
 	         join.essid, join.bss_type, join.channel, le16_to_cpu(join.timeout));
-	return at76_set_card_command(dev->udev, CMD_JOIN, &join,
+	return at76_set_card_command(priv->udev, CMD_JOIN, &join,
 				     sizeof(struct at76_join));
 }
 
@@ -1612,8 +1612,8 @@ static void at76_read_bulk_callback(struct urb *urb)
 
 static void at76_write_bulk_callback(struct urb *urb)
 {
-	struct at76_priv *dev = urb->context;
-	struct net_device_stats *stats = &dev->stats;
+	struct at76_priv *priv = urb->context;
+	struct net_device_stats *stats = &priv->stats;
 	unsigned long flags;
 	struct at76_tx_buffer *mgmt_buf;
 	int ret;
@@ -1629,39 +1629,39 @@ static void at76_write_bulk_callback(struct urb *urb)
 	} else
 		stats->tx_packets++;
 
-	spin_lock_irqsave(&dev->mgmt_spinlock, flags);
-	mgmt_buf = dev->next_mgmt_bulk;
-	dev->next_mgmt_bulk = NULL;
-	spin_unlock_irqrestore(&dev->mgmt_spinlock, flags);
+	spin_lock_irqsave(&priv->mgmt_spinlock, flags);
+	mgmt_buf = priv->next_mgmt_bulk;
+	priv->next_mgmt_bulk = NULL;
+	spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
 
 	if (mgmt_buf) {
 		/* we don't copy the padding bytes, but add them
 		   to the length */
-		memcpy(dev->bulk_out_buffer, mgmt_buf,
+		memcpy(priv->bulk_out_buffer, mgmt_buf,
 		       le16_to_cpu(mgmt_buf->wlength) +
 		       offsetof(struct at76_tx_buffer, packet));
-		usb_fill_bulk_urb(dev->write_urb, dev->udev,
-				  usb_sndbulkpipe(dev->udev,
-						  dev->bulk_out_endpointAddr),
-				  dev->bulk_out_buffer,
+		usb_fill_bulk_urb(priv->write_urb, priv->udev,
+				  usb_sndbulkpipe(priv->udev,
+						  priv->bulk_out_endpointAddr),
+				  priv->bulk_out_buffer,
 				  le16_to_cpu(mgmt_buf->wlength) +
 				  mgmt_buf->padding + AT76_TX_HDRLEN,
 				  at76_write_bulk_callback,
-				  dev);
-		ret = usb_submit_urb(dev->write_urb, GFP_ATOMIC);
+				  priv);
+		ret = usb_submit_urb(priv->write_urb, GFP_ATOMIC);
 		if (ret) {
 			err("%s: %s error in tx submit urb: %d",
-			    dev->netdev->name, __FUNCTION__, ret);
+			    priv->netdev->name, __FUNCTION__, ret);
 		}
 		kfree(mgmt_buf);
 	} else
-		netif_wake_queue(dev->netdev);
+		netif_wake_queue(priv->netdev);
 }
 
 
 /* send a management frame on bulk-out.
    txbuf->wlength must be set (in LE format !) */
-static int at76_send_mgmt_bulk(struct at76_priv *dev,
+static int at76_send_mgmt_bulk(struct at76_priv *priv,
 			       struct at76_tx_buffer *txbuf)
 {
 	unsigned long flags;
@@ -1669,27 +1669,27 @@ static int at76_send_mgmt_bulk(struct at76_priv *dev,
 	int urb_status;
 	void *oldbuf = NULL;
 
-	netif_carrier_off(dev->netdev);	/* disable running netdev watchdog */
-	netif_stop_queue(dev->netdev);	/* stop tx data packets */
+	netif_carrier_off(priv->netdev);	/* disable running netdev watchdog */
+	netif_stop_queue(priv->netdev);	/* stop tx data packets */
 
-	spin_lock_irqsave(&dev->mgmt_spinlock, flags);
+	spin_lock_irqsave(&priv->mgmt_spinlock, flags);
 
-	if ((urb_status = dev->write_urb->status) == -EINPROGRESS) {
-		oldbuf = dev->next_mgmt_bulk;	/* to kfree below */
-		dev->next_mgmt_bulk = txbuf;
+	if ((urb_status = priv->write_urb->status) == -EINPROGRESS) {
+		oldbuf = priv->next_mgmt_bulk;	/* to kfree below */
+		priv->next_mgmt_bulk = txbuf;
 		txbuf = NULL;
 	}
-	spin_unlock_irqrestore(&dev->mgmt_spinlock, flags);
+	spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
 
 	if (oldbuf) {
 		/* a data/mgmt tx is already pending in the URB -
 		   if this is no error in some situations we must
 		   implement a queue or silently modify the old msg */
 		err("%s: %s removed pending mgmt buffer %s",
-		    dev->netdev->name, __FUNCTION__,
-		    hex2str(dev->obuf, dev->next_mgmt_bulk,
-			    min((int)(sizeof(dev->obuf)) / 3, 64), ' '));
-		kfree(dev->next_mgmt_bulk);
+		    priv->netdev->name, __FUNCTION__,
+		    hex2str(priv->obuf, priv->next_mgmt_bulk,
+			    min((int)(sizeof(priv->obuf)) / 3, 64), ' '));
+		kfree(priv->next_mgmt_bulk);
 	}
 
 	if (txbuf) {
@@ -1697,34 +1697,34 @@ static int at76_send_mgmt_bulk(struct at76_priv *dev,
 		txbuf->tx_rate = 0;
 		txbuf->padding = at76_calc_padding(le16_to_cpu(txbuf->wlength));
 
-		if (dev->next_mgmt_bulk) {
+		if (priv->next_mgmt_bulk) {
 			err("%s: %s URB status %d, but mgmt is pending",
-			    dev->netdev->name, __FUNCTION__, urb_status);
+			    priv->netdev->name, __FUNCTION__, urb_status);
 		}
 
 		at76_dbg(DBG_TX_MGMT, "%s: tx mgmt: wlen %d tx_rate %d pad %d %s",
-		         dev->netdev->name, le16_to_cpu(txbuf->wlength),
+		         priv->netdev->name, le16_to_cpu(txbuf->wlength),
 		         txbuf->tx_rate, txbuf->padding,
-		         hex2str(dev->obuf, txbuf->packet,
-			    min((sizeof(dev->obuf) - 1) / 2,
+		         hex2str(priv->obuf, txbuf->packet,
+			    min((sizeof(priv->obuf) - 1) / 2,
 				(size_t) le16_to_cpu(txbuf->wlength)), '\0'));
 
 		/* txbuf was not consumed above -> send mgmt msg immediately */
-		memcpy(dev->bulk_out_buffer, txbuf,
+		memcpy(priv->bulk_out_buffer, txbuf,
 		       le16_to_cpu(txbuf->wlength) + AT76_TX_HDRLEN);
-		usb_fill_bulk_urb(dev->write_urb, dev->udev,
-				  usb_sndbulkpipe(dev->udev,
-						  dev->bulk_out_endpointAddr),
-				  dev->bulk_out_buffer,
+		usb_fill_bulk_urb(priv->write_urb, priv->udev,
+				  usb_sndbulkpipe(priv->udev,
+						  priv->bulk_out_endpointAddr),
+				  priv->bulk_out_buffer,
 				  le16_to_cpu(txbuf->wlength) +
 				  txbuf->padding +
 				  AT76_TX_HDRLEN,
 				  at76_write_bulk_callback,
-				  dev);
-		ret = usb_submit_urb(dev->write_urb, GFP_ATOMIC);
+				  priv);
+		ret = usb_submit_urb(priv->write_urb, GFP_ATOMIC);
 		if (ret) {
 			err("%s: %s error in tx submit urb: %d",
-			    dev->netdev->name, __FUNCTION__, ret);
+			    priv->netdev->name, __FUNCTION__, ret);
 		}
 		kfree(txbuf);
 	}
@@ -1744,7 +1744,7 @@ static inline void next_ie(struct ieee80211_info_element **ie)
    we got with seq_nr 2 for shared secret authentication only and
    send in seq_nr 3 WEP encrypted to prove we have the correct WEP key;
    otherwise it is NULL */
-static int at76_auth_req(struct at76_priv *dev, struct bss_info *bss,
+static int at76_auth_req(struct at76_priv *priv, struct bss_info *bss,
 			 int seq_nr, struct ieee80211_info_element *challenge)
 {
 	struct at76_tx_buffer *tx_buffer;
@@ -1769,11 +1769,11 @@ static int at76_auth_req(struct at76_priv *dev, struct bss_info *bss,
 
 	mgmt->duration_id = cpu_to_le16(0x8000);
 	memcpy(mgmt->addr1, bss->bssid, ETH_ALEN);
-	memcpy(mgmt->addr2, dev->netdev->dev_addr, ETH_ALEN);
+	memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN);
 	memcpy(mgmt->addr3, bss->bssid, ETH_ALEN);
 	mgmt->seq_ctl = cpu_to_le16(0);
 
-	req->algorithm = cpu_to_le16(dev->auth_mode);
+	req->algorithm = cpu_to_le16(priv->auth_mode);
 	req->transaction = cpu_to_le16(seq_nr);
 	req->status = cpu_to_le16(0);
 
@@ -1783,22 +1783,22 @@ static int at76_auth_req(struct at76_priv *dev, struct bss_info *bss,
 	/* init. at76_priv tx header */
 	tx_buffer->wlength = cpu_to_le16(buf_len - AT76_TX_HDRLEN);
 	at76_dbg(DBG_TX_MGMT, "%s: AuthReq bssid %s alg %d seq_nr %d",
-	         dev->netdev->name, mac2str(mgmt->addr3),
+	         priv->netdev->name, mac2str(mgmt->addr3),
 	         le16_to_cpu(req->algorithm), le16_to_cpu(req->transaction));
 	if (seq_nr == 3) {
 		at76_dbg(DBG_TX_MGMT, "%s: AuthReq challenge: %s ...",
-		         dev->netdev->name,
-		         hex2str(dev->obuf, req->info_element,
-		             min((int)sizeof(dev->obuf) / 3, 18), ' '));
+		         priv->netdev->name,
+		         hex2str(priv->obuf, req->info_element,
+		             min((int)sizeof(priv->obuf) / 3, 18), ' '));
 	}
 
 	/* either send immediately (if no data tx is pending
 	   or put it in pending list */
-	return at76_send_mgmt_bulk(dev, tx_buffer);
+	return at76_send_mgmt_bulk(priv, tx_buffer);
 }
 
 
-static int at76_assoc_req(struct at76_priv *dev, struct bss_info *bss)
+static int at76_assoc_req(struct at76_priv *priv, struct bss_info *bss)
 {
 	struct at76_tx_buffer *tx_buffer;
 	struct ieee80211_hdr_3addr *mgmt;
@@ -1820,7 +1820,7 @@ static int at76_assoc_req(struct at76_priv *dev, struct bss_info *bss)
 
 	mgmt->duration_id = cpu_to_le16(0x8000);
 	memcpy(mgmt->addr1, bss->bssid, ETH_ALEN);
-	memcpy(mgmt->addr2, dev->netdev->dev_addr, ETH_ALEN);
+	memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN);
 	memcpy(mgmt->addr3, bss->bssid, ETH_ALEN);
 	mgmt->seq_ctl = cpu_to_le16(0);
 
@@ -1829,8 +1829,8 @@ static int at76_assoc_req(struct at76_priv *dev, struct bss_info *bss)
 	   to us.  AP only set the Privacy bit in their capabilities
 	   if WEP is mandatory in the BSS! */
 	req->capability = cpu_to_le16(bss->capa |
-				      (dev->wep_enabled ? WLAN_CAPABILITY_PRIVACY : 0) |
-				      (dev->preamble_type == PREAMBLE_TYPE_SHORT ?
+				      (priv->wep_enabled ? WLAN_CAPABILITY_PRIVACY : 0) |
+				      (priv->preamble_type == PREAMBLE_TYPE_SHORT ?
 				       WLAN_CAPABILITY_SHORT_PREAMBLE : 0));
 
 	req->listen_interval = cpu_to_le16(2 * bss->beacon_interval);
@@ -1857,25 +1857,25 @@ static int at76_assoc_req(struct at76_priv *dev, struct bss_info *bss)
 
 		tlv = req->info_element;
 		len = min_t(int, IW_ESSID_MAX_SIZE, tlv->len);
-		memcpy(dev->obuf, tlv->data, len);
-		dev->obuf[len] = '\0';
+		memcpy(priv->obuf, tlv->data, len);
+		priv->obuf[len] = '\0';
 		next_ie(&tlv); /* points to IE of rates now */
 		at76_dbg(DBG_TX_MGMT, "%s: AssocReq bssid %s capa x%04x ssid %s rates %s",
-		         dev->netdev->name, mac2str(mgmt->addr3),
-		         le16_to_cpu(req->capability), dev->obuf,
+		         priv->netdev->name, mac2str(mgmt->addr3),
+		         le16_to_cpu(req->capability), priv->obuf,
 		         hex2str(orates,tlv->data,min((sizeof(orates)-1)/2,(size_t)tlv->len),
 			    '\0'));
 	}
 
 	/* either send immediately (if no data tx is pending
 	   or put it in pending list */
-	return at76_send_mgmt_bulk(dev, tx_buffer);
+	return at76_send_mgmt_bulk(priv, tx_buffer);
 }
 
 
 /* we are currently associated to curr_bss and
    want to reassoc to new_bss */
-static int at76_reassoc_req(struct at76_priv *dev, struct bss_info *curr_bss,
+static int at76_reassoc_req(struct at76_priv *priv, struct bss_info *curr_bss,
 		            struct bss_info *new_bss)
 {
 	struct at76_tx_buffer *tx_buffer;
@@ -1901,7 +1901,7 @@ static int at76_reassoc_req(struct at76_priv *dev, struct bss_info *curr_bss,
 	mgmt->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_REASSOC_REQ);
 	mgmt->duration_id = cpu_to_le16(0x8000);
 	memcpy(mgmt->addr1, new_bss->bssid, ETH_ALEN);
-	memcpy(mgmt->addr2, dev->netdev->dev_addr, ETH_ALEN);
+	memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN);
 	memcpy(mgmt->addr3, new_bss->bssid, ETH_ALEN);
 	mgmt->seq_ctl = cpu_to_le16(0);
 
@@ -1910,8 +1910,8 @@ static int at76_reassoc_req(struct at76_priv *dev, struct bss_info *curr_bss,
 	   to us.  AP only set the Privacy bit in their capabilities
 	   if WEP is mandatory in the BSS! */
 	req->capability = cpu_to_le16(new_bss->capa |
-				      (dev->wep_enabled ? WLAN_CAPABILITY_PRIVACY : 0) |
-				      (dev->preamble_type == PREAMBLE_TYPE_SHORT ?
+				      (priv->wep_enabled ? WLAN_CAPABILITY_PRIVACY : 0) |
+				      (priv->preamble_type == PREAMBLE_TYPE_SHORT ?
 				       WLAN_CAPABILITY_SHORT_PREAMBLE : 0));
 
 	req->listen_interval = cpu_to_le16(2 * new_bss->beacon_interval);
@@ -1938,24 +1938,24 @@ static int at76_reassoc_req(struct at76_priv *dev, struct bss_info *curr_bss,
 		char orates[4*2+1];
 		char ocurr[6*3+1];
 		tlv = req->info_element;
-		memcpy(dev->obuf, tlv->data, min(sizeof(dev->obuf),(size_t)tlv->len));
-		dev->obuf[IW_ESSID_MAX_SIZE] = '\0';
+		memcpy(priv->obuf, tlv->data, min(sizeof(priv->obuf),(size_t)tlv->len));
+		priv->obuf[IW_ESSID_MAX_SIZE] = '\0';
 		next_ie(&tlv); /* points to IE of rates now */
 		at76_dbg(DBG_TX_MGMT, "%s: ReAssocReq curr %s new %s capa x%04x ssid %s rates %s",
-		         dev->netdev->name,
+		         priv->netdev->name,
 		         hex2str(ocurr, req->current_ap, ETH_ALEN, ':'),
-		         mac2str(mgmt->addr3), le16_to_cpu(req->capability), dev->obuf,
+		         mac2str(mgmt->addr3), le16_to_cpu(req->capability), priv->obuf,
 		         hex2str(orates,tlv->data,min((sizeof(orates)-1)/2,(size_t)tlv->len),
 			    '\0'));
 	}
 
 	/* either send immediately (if no data tx is pending
 	   or put it in pending list */
-	return at76_send_mgmt_bulk(dev, tx_buffer);
+	return at76_send_mgmt_bulk(priv, tx_buffer);
 }
 
 
-static int at76_disassoc_req(struct at76_priv *dev, struct bss_info *bss)
+static int at76_disassoc_req(struct at76_priv *priv, struct bss_info *bss)
 {
 	struct at76_tx_buffer *tx_buffer;
 	struct ieee80211_hdr_3addr *mgmt;
@@ -1976,7 +1976,7 @@ static int at76_disassoc_req(struct at76_priv *dev, struct bss_info *bss)
 	mgmt->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_AUTH);
 	mgmt->duration_id = cpu_to_le16(0x8000);
 	memcpy(mgmt->addr1, bss->bssid, ETH_ALEN);
-	memcpy(mgmt->addr2, dev->netdev->dev_addr, ETH_ALEN);
+	memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN);
 	memcpy(mgmt->addr3, bss->bssid, ETH_ALEN);
 	mgmt->seq_ctl = cpu_to_le16(0);
 
@@ -1986,81 +1986,81 @@ static int at76_disassoc_req(struct at76_priv *dev, struct bss_info *bss)
 	tx_buffer->wlength = cpu_to_le16(DISASSOC_FRAME_SIZE - AT76_TX_HDRLEN);
 
 	at76_dbg(DBG_TX_MGMT, "%s: DisAssocReq bssid %s",
-	         dev->netdev->name, mac2str(mgmt->addr3));
+	         priv->netdev->name, mac2str(mgmt->addr3));
 
 	/* either send immediately (if no data tx is pending
 	   or put it in pending list */
-	return at76_send_mgmt_bulk(dev, tx_buffer);
+	return at76_send_mgmt_bulk(priv, tx_buffer);
 }
 
 
 /* the firmware download timeout (after remap) */
 static void at76_fw_dl_timeout(unsigned long par)
 {
-	struct at76_priv *dev = (struct at76_priv *)par;
-	schedule_work(&dev->work_reset_device);
+	struct at76_priv *priv = (struct at76_priv *)par;
+	schedule_work(&priv->work_reset_device);
 }
 
 
 /* the restart timer timed out */
 static void at76_restart_timeout(unsigned long par)
 {
-	struct at76_priv *dev = (struct at76_priv *)par;
-	schedule_work(&dev->work_restart);
+	struct at76_priv *priv = (struct at76_priv *)par;
+	schedule_work(&priv->work_restart);
 }
 
 
 /* we got to check the bss_list for old entries */
 static void at76_bss_list_timeout(unsigned long par)
 {
-	struct at76_priv *dev = (struct at76_priv *)par;
+	struct at76_priv *priv = (struct at76_priv *)par;
 	unsigned long flags;
 	struct list_head *lptr, *nptr;
 	struct bss_info *ptr;
 
-	spin_lock_irqsave(&dev->bss_list_spinlock, flags);
+	spin_lock_irqsave(&priv->bss_list_spinlock, flags);
 
-	list_for_each_safe(lptr, nptr, &dev->bss_list) {
+	list_for_each_safe(lptr, nptr, &priv->bss_list) {
 
 		ptr = list_entry(lptr, struct bss_info, list);
 
-		if (ptr != dev->curr_bss && ptr != dev->new_bss &&
+		if (ptr != priv->curr_bss && ptr != priv->new_bss &&
 		    time_after(jiffies, ptr->last_rx + BSS_LIST_TIMEOUT)) {
 			at76_dbg(DBG_BSS_TABLE_RM,
 			         "%s: bss_list: removing old BSS %s ch %d",
-			         dev->netdev->name, mac2str(ptr->bssid),
+			         priv->netdev->name, mac2str(ptr->bssid),
 			         ptr->channel);
 			list_del(&ptr->list);
 			kfree(ptr);
 		}
 	}
-	spin_unlock_irqrestore(&dev->bss_list_spinlock, flags);
+	spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
 	/* restart the timer */
-	mod_timer(&dev->bss_list_timer, jiffies + BSS_LIST_TIMEOUT);
+	mod_timer(&priv->bss_list_timer, jiffies + BSS_LIST_TIMEOUT);
 }
 
 
-static void at76_dump_bss_table(struct at76_priv *dev)
+static void at76_dump_bss_table(struct at76_priv *priv)
 {
 	struct bss_info *ptr;
 	unsigned long flags;
 	struct list_head *lptr;
 	char obuf_s[3*32];
 
-	spin_lock_irqsave(&dev->bss_list_spinlock, flags);
+	spin_lock_irqsave(&priv->bss_list_spinlock, flags);
 
-	pr_debug("%s BSS table (curr=%p, new=%p):", dev->netdev->name,
-	         dev->curr_bss, dev->new_bss);
+	pr_debug("%s BSS table (curr=%p, new=%p):", priv->netdev->name,
+	         priv->curr_bss, priv->new_bss);
 
-	list_for_each(lptr, &dev->bss_list) {
+	list_for_each(lptr, &priv->bss_list) {
 		ptr = list_entry(lptr, struct bss_info, list);
 		pr_debug("0x%p: bssid %s channel %d ssid %s (%s)"
 		         " capa x%04x rates %s rssi %d link %d noise %d",
 		         ptr, mac2str(ptr->bssid),
 		         ptr->channel,
 		         ptr->ssid,
-		         hex2str(dev->obuf, ptr->ssid,
-			       min((sizeof(dev->obuf) - 1) / 2,
+		         hex2str(priv->obuf, ptr->ssid,
+			       min((sizeof(priv->obuf) - 1) / 2,
 				   (size_t) ptr->ssid_len), '\0'),
 		         ptr->capa,
 		         hex2str(obuf_s, ptr->rates,
@@ -2068,132 +2068,132 @@ static void at76_dump_bss_table(struct at76_priv *dev)
 				   (size_t) ptr->rates_len), ' '),
 		         ptr->rssi, ptr->link_qual, ptr->noise_level);
 	}
-	spin_unlock_irqrestore(&dev->bss_list_spinlock, flags);
+	spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
 }
 
 
 /* we got a timeout for a infrastructure mgmt packet */
 static void at76_mgmt_timeout(unsigned long par)
 {
-	struct at76_priv *dev = (struct at76_priv *)par;
-	schedule_work(&dev->work_mgmt_timeout);
+	struct at76_priv *priv = (struct at76_priv *)par;
+	schedule_work(&priv->work_mgmt_timeout);
 }
 
 
 /*
  * at76_work_mgmt_timeout_scan - expiry of management timer in istate SCANNING
  */
-static void at76_handle_mgmt_timeout_scan(struct at76_priv *dev)
+static void at76_handle_mgmt_timeout_scan(struct at76_priv *priv)
 {
 	int status, ret;
 	struct mib_mdomain mdomain;
 
-	if ((status = at76_get_cmd_status(dev->udev, CMD_SCAN)) < 0) {
+	if ((status = at76_get_cmd_status(priv->udev, CMD_SCAN)) < 0) {
 		err("%s: %s: at76_get_cmd_status failed with %d",
-		    dev->netdev->name, __FUNCTION__, status);
+		    priv->netdev->name, __FUNCTION__, status);
 		status = CMD_STATUS_IN_PROGRESS;
 		/* INFO: Hope it was a one off error - if not, scanning
 		   further down the line and stop this cycle */
 	}
 	at76_dbg(DBG_PROGRESS, "%s %s:%d got cmd_status %d (istate %d, "
 	         "scan_runs %d)",
-	         dev->netdev->name, __FUNCTION__, __LINE__, status,
-	         dev->istate, dev->scan_runs);
+	         priv->netdev->name, __FUNCTION__, __LINE__, status,
+	         priv->istate, priv->scan_runs);
 	if (status == CMD_STATUS_COMPLETE) {
-		if (dev->istate == SCANNING) {
+		if (priv->istate == SCANNING) {
 			if (at76_debug & DBG_BSS_TABLE)
-				at76_dump_bss_table(dev);
-			switch (dev->scan_runs) {
+				at76_dump_bss_table(priv);
+			switch (priv->scan_runs) {
 
 			case 1:
-				at76_assert(dev->international_roaming);
-				if ((ret=at76_get_mib_mdomain(dev, &mdomain)) < 0) {
+				at76_assert(priv->international_roaming);
+				if ((ret=at76_get_mib_mdomain(priv, &mdomain)) < 0) {
 					err("at76_get_mib_mdomain returned %d", ret);
 				} else {
 					char obuf1[2*14+1], obuf2[2*14+1];
 
 					at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %s "
 					         "tx_powerlevel %s",
-					         dev->netdev->name,
+					         priv->netdev->name,
 					         hex2str(obuf1, mdomain.channel_list,
 				     		    (sizeof(obuf1)-1)/2,'\0'),
 				     	         hex2str(obuf2, mdomain.tx_powerlevel,
 						    (sizeof(obuf2)-1)/2,'\0'));
 				}
-				if ((ret = at76_start_scan(dev, 0, 1)) < 0) {
+				if ((ret = at76_start_scan(priv, 0, 1)) < 0) {
 					err("%s: %s: start_scan (ANY) failed with %d",
-					    dev->netdev->name, __FUNCTION__, ret);
+					    priv->netdev->name, __FUNCTION__, ret);
 				}
 				at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer for %d ticks",
 				         __FUNCTION__, __LINE__, SCAN_POLL_INTERVAL);
-				mod_timer(&dev->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
+				mod_timer(&priv->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
 				break;
 
 			case 2:
-				if ((ret = at76_start_scan(dev, 1, 1)) < 0) {
+				if ((ret = at76_start_scan(priv, 1, 1)) < 0) {
 					err("%s: %s: start_scan (SSID) failed with %d",
-					    dev->netdev->name, __FUNCTION__, ret);
+					    priv->netdev->name, __FUNCTION__, ret);
 				}
 				at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer for %d ticks",
 				         __FUNCTION__, __LINE__, SCAN_POLL_INTERVAL);
-				mod_timer(&dev->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
+				mod_timer(&priv->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
 				break;
 
 			case 3:
-				dev->scan_state = SCAN_COMPLETED;
+				priv->scan_state = SCAN_COMPLETED;
 				/* report the end of scan to user space */
-				at76_iwevent_scan_complete(dev->netdev);
-				dev->istate = JOINING;
+				at76_iwevent_scan_complete(priv->netdev);
+				priv->istate = JOINING;
 				/* call join_bss immediately after
 				   re-run of all other threads in at76_devent */
-				schedule_work(&dev->work_join);
+				schedule_work(&priv->work_join);
 				break;
 
 			default:
-				err("unexpected dev->scan_runs %d", dev->scan_runs);
+				err("unexpected priv->scan_runs %d", priv->scan_runs);
 			}
-			dev->scan_runs++;
+			priv->scan_runs++;
 		} else {
 
-			at76_assert(dev->istate == MONITORING);
+			at76_assert(priv->istate == MONITORING);
 			at76_dbg(DBG_MONITOR_MODE, "%s: MONITOR MODE: restart scan",
-			         dev->netdev->name);
-			at76_start_scan(dev, 0, 0);
+			         priv->netdev->name);
+			at76_start_scan(priv, 0, 0);
 			at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer for %d ticks",
 			         __FUNCTION__, __LINE__, SCAN_POLL_INTERVAL);
-			mod_timer(&dev->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
+			mod_timer(&priv->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
 		}
 
 	} else {
 		if ((status != CMD_STATUS_IN_PROGRESS) &&
 		    (status != CMD_STATUS_IDLE))
 			err("%s: %s: Bad scan status: %s",
-			    dev->netdev->name, __FUNCTION__,
+			    priv->netdev->name, __FUNCTION__,
 			    at76_get_cmd_status_string(status));
 
 		/* the first cmd status after scan start is always a IDLE ->
 		   start the timer to poll again until COMPLETED */
 		at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer for %d ticks",
 		         __FUNCTION__, __LINE__, SCAN_POLL_INTERVAL);
-		mod_timer(&dev->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
+		mod_timer(&priv->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
 	}
 }
 
 
 /* the deferred procedure called from at76_devent() */
-static void at76_handle_mgmt_timeout(struct at76_priv *dev)
+static void at76_handle_mgmt_timeout(struct at76_priv *priv)
 {
-	if ((dev->istate != SCANNING && dev->istate != MONITORING) ||
+	if ((priv->istate != SCANNING && priv->istate != MONITORING) ||
 	    (at76_debug & DBG_MGMT_TIMER))
 		/* this is normal behavior in states MONITORING, SCANNING ... */
-		at76_dbg(DBG_PROGRESS, "%s: timeout, state %d", dev->netdev->name,
-		         dev->istate);
+		at76_dbg(DBG_PROGRESS, "%s: timeout, state %d", priv->netdev->name,
+		         priv->istate);
 
-	switch (dev->istate) {
+	switch (priv->istate) {
 
 	case MONITORING:
 	case SCANNING:
-		at76_handle_mgmt_timeout_scan(dev);
+		at76_handle_mgmt_timeout_scan(priv);
 		break;
 
 	case JOINING:
@@ -2203,73 +2203,73 @@ static void at76_handle_mgmt_timeout(struct at76_priv *dev)
 	case CONNECTED:	/* we haven't received the beacon of this BSS for
 				   BEACON_TIMEOUT seconds */
 		info("%s: lost beacon bssid %s",
-		     dev->netdev->name, mac2str(dev->curr_bss->bssid));
+		     priv->netdev->name, mac2str(priv->curr_bss->bssid));
 		/* jal: starting mgmt_timer in ad-hoc mode is questionable,
 		   but I'll leave it here to track down another lockup problem */
-		if (dev->iw_mode != IW_MODE_ADHOC) {
-			netif_carrier_off(dev->netdev);
-			netif_stop_queue(dev->netdev);
-			at76_iwevent_bss_disconnect(dev->netdev);
-			dev->istate = SCANNING;
-			schedule_work(&dev->work_scan);
+		if (priv->iw_mode != IW_MODE_ADHOC) {
+			netif_carrier_off(priv->netdev);
+			netif_stop_queue(priv->netdev);
+			at76_iwevent_bss_disconnect(priv->netdev);
+			priv->istate = SCANNING;
+			schedule_work(&priv->work_scan);
 		}
 		break;
 
 	case AUTHENTICATING:
-		if (dev->retries-- >= 0) {
-			at76_auth_req(dev, dev->curr_bss, 1, NULL);
+		if (priv->retries-- >= 0) {
+			at76_auth_req(priv, priv->curr_bss, 1, NULL);
 			at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
 			         __FUNCTION__, __LINE__);
-			mod_timer(&dev->mgmt_timer, jiffies + HZ);
+			mod_timer(&priv->mgmt_timer, jiffies + HZ);
 		} else {
 			/* try to get next matching BSS */
-			dev->istate = JOINING;
-			schedule_work(&dev->work_join);
+			priv->istate = JOINING;
+			schedule_work(&priv->work_join);
 		}
 		break;
 
 	case ASSOCIATING:
-		if (dev->retries-- >= 0) {
-			at76_assoc_req(dev, dev->curr_bss);
+		if (priv->retries-- >= 0) {
+			at76_assoc_req(priv, priv->curr_bss);
 			at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
 			         __FUNCTION__, __LINE__);
-			mod_timer(&dev->mgmt_timer, jiffies + HZ);
+			mod_timer(&priv->mgmt_timer, jiffies + HZ);
 		} else {
 			/* jal: TODO: we may be authenticated to several
 			   BSS and may try to associate to the next of them here
 			   in the future ... */
 
 			/* try to get next matching BSS */
-			dev->istate = JOINING;
-			schedule_work(&dev->work_join);
+			priv->istate = JOINING;
+			schedule_work(&priv->work_join);
 		}
 		break;
 
 	case REASSOCIATING:
-		if (dev->retries-- >= 0)
-			at76_reassoc_req(dev, dev->curr_bss, dev->new_bss);
+		if (priv->retries-- >= 0)
+			at76_reassoc_req(priv, priv->curr_bss, priv->new_bss);
 		else {
 			/* we disassociate from the curr_bss and
 			   scan again ... */
-			dev->istate = DISASSOCIATING;
-			dev->retries = DISASSOC_RETRIES;
-			at76_disassoc_req(dev, dev->curr_bss);
+			priv->istate = DISASSOCIATING;
+			priv->retries = DISASSOC_RETRIES;
+			at76_disassoc_req(priv, priv->curr_bss);
 		}
 		at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
 		         __FUNCTION__, __LINE__);
-		mod_timer(&dev->mgmt_timer, jiffies + HZ);
+		mod_timer(&priv->mgmt_timer, jiffies + HZ);
 		break;
 
 	case DISASSOCIATING:
-		if (dev->retries-- >= 0) {
-			at76_disassoc_req(dev, dev->curr_bss);
+		if (priv->retries-- >= 0) {
+			at76_disassoc_req(priv, priv->curr_bss);
 			at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
 		     	         __FUNCTION__, __LINE__);
-			mod_timer(&dev->mgmt_timer, jiffies + HZ);
+			mod_timer(&priv->mgmt_timer, jiffies + HZ);
 		} else {
 			/* we scan again ... */
-			dev->istate = SCANNING;
-			schedule_work(&dev->work_scan);
+			priv->istate = SCANNING;
+			schedule_work(&priv->work_scan);
 		}
 		break;
 
@@ -2285,116 +2285,116 @@ static void at76_handle_mgmt_timeout(struct at76_priv *dev)
 /* Called after successful association */
 static void at76_work_assoc_done(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_assoc_done);
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	at76_assert(dev->istate == ASSOCIATING || dev->istate == REASSOCIATING);
-	if (dev->iw_mode == IW_MODE_INFRA) {
-		at76_assert(dev->curr_bss != NULL);
-		if (dev->curr_bss != NULL && dev->pm_mode != AT76_PM_OFF) {
+	at76_assert(priv->istate == ASSOCIATING || priv->istate == REASSOCIATING);
+	if (priv->iw_mode == IW_MODE_INFRA) {
+		at76_assert(priv->curr_bss != NULL);
+		if (priv->curr_bss != NULL && priv->pm_mode != AT76_PM_OFF) {
 			/* calculate the listen interval in units of
 			   beacon intervals of the curr_bss */
-			u32 pm_period_beacon = (dev->pm_period >> 10) /
-						dev->curr_bss->beacon_interval;
+			u32 pm_period_beacon = (priv->pm_period >> 10) /
+						priv->curr_bss->beacon_interval;
 
 			pm_period_beacon = max(pm_period_beacon, 2u);
 			pm_period_beacon = min(pm_period_beacon, 0xffffu);
 
 			at76_dbg(DBG_PM, "%s: pm_mode %d assoc id x%x listen int %d",
-			         dev->netdev->name, dev->pm_mode,
-			         dev->curr_bss->assoc_id, pm_period_beacon);
+			         priv->netdev->name, priv->pm_mode,
+			         priv->curr_bss->assoc_id, pm_period_beacon);
 
-			at76_set_associd(dev, dev->curr_bss->assoc_id);
-			at76_set_listen_interval(dev, (u16)pm_period_beacon);
+			at76_set_associd(priv, priv->curr_bss->assoc_id);
+			at76_set_listen_interval(priv, (u16)pm_period_beacon);
 #ifdef DEBUG
-			at76_dump_mib_mac(dev);
-			at76_dump_mib_mac_mgmt(dev);
+			at76_dump_mib_mac(priv);
+			at76_dump_mib_mac_mgmt(priv);
 #endif
 		}
 	}
-	at76_set_pm_mode(dev);
+	at76_set_pm_mode(priv);
 
-	netif_carrier_on(dev->netdev);
-	netif_wake_queue(dev->netdev);
-	dev->istate = CONNECTED;
-	at76_iwevent_bss_connect(dev->netdev, dev->curr_bss->bssid);
+	netif_carrier_on(priv->netdev);
+	netif_wake_queue(priv->netdev);
+	priv->istate = CONNECTED;
+	at76_iwevent_bss_connect(priv->netdev, priv->curr_bss->bssid);
 	at76_dbg(DBG_PROGRESS, "%s: connected to BSSID %s",
-	         dev->netdev->name, mac2str(dev->curr_bss->bssid));
+	         priv->netdev->name, mac2str(priv->curr_bss->bssid));
 
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
-static void at76_delete_device(struct at76_priv *dev)
+static void at76_delete_device(struct at76_priv *priv)
 {
 	int i;
 
-	if (!dev)
+	if (!priv)
 		return;
 
 	/* signal to _stop() that the device is gone */
-	dev->device_unplugged = 1;
+	priv->device_unplugged = 1;
 
 	at76_dbg(DBG_PROC_ENTRY, "%s: ENTER",__FUNCTION__);
 
-	if (dev->netdev_registered) {
-		unregister_netdev(dev->netdev);
+	if (priv->netdev_registered) {
+		unregister_netdev(priv->netdev);
 	}
 
-	usb_put_dev(dev->udev);
+	usb_put_dev(priv->udev);
 
 	/* assuming we used keventd, it must quiesce too */
 	flush_scheduled_work();
 
-	if (dev->bulk_out_buffer != NULL)
-		kfree(dev->bulk_out_buffer);
+	if (priv->bulk_out_buffer != NULL)
+		kfree(priv->bulk_out_buffer);
 
-	kfree(dev->ctrl_buffer);
+	kfree(priv->ctrl_buffer);
 
-	if (dev->write_urb != NULL) {
-		usb_kill_urb(dev->write_urb);
-		usb_free_urb(dev->write_urb);
+	if (priv->write_urb != NULL) {
+		usb_kill_urb(priv->write_urb);
+		usb_free_urb(priv->write_urb);
 	}
-	if (dev->read_urb != NULL) {
-		usb_kill_urb(dev->read_urb);
-		usb_free_urb(dev->read_urb);
+	if (priv->read_urb != NULL) {
+		usb_kill_urb(priv->read_urb);
+		usb_free_urb(priv->read_urb);
 	}
-	if (dev->ctrl_buffer != NULL) {
-		usb_kill_urb(dev->ctrl_urb);
-		usb_free_urb(dev->ctrl_urb);
+	if (priv->ctrl_buffer != NULL) {
+		usb_kill_urb(priv->ctrl_urb);
+		usb_free_urb(priv->ctrl_urb);
 	}
 
 	at76_dbg(DBG_PROC_ENTRY, "%s: unlinked urbs", __FUNCTION__);
 
-	if (dev->rx_skb != NULL)
-		kfree_skb(dev->rx_skb);
+	if (priv->rx_skb != NULL)
+		kfree_skb(priv->rx_skb);
 
-	at76_free_bss_list(dev);
-	del_timer_sync(&dev->bss_list_timer);
+	at76_free_bss_list(priv);
+	del_timer_sync(&priv->bss_list_timer);
 
-	if (dev->istate == CONNECTED) {
-		at76_iwevent_bss_disconnect(dev->netdev);
+	if (priv->istate == CONNECTED) {
+		at76_iwevent_bss_disconnect(priv->netdev);
 	}
 
 	for (i = 0; i < NR_RX_DATA_BUF; i++)
-		if (dev->rx_data[i].skb != NULL) {
-			dev_kfree_skb(dev->rx_data[i].skb);
-			dev->rx_data[i].skb = NULL;
+		if (priv->rx_data[i].skb != NULL) {
+			dev_kfree_skb(priv->rx_data[i].skb);
+			priv->rx_data[i].skb = NULL;
 		}
-	at76_dbg(DBG_PROC_ENTRY, "%s: before freeing dev/netdev", __FUNCTION__);
-	free_netdev(dev->netdev); /* dev is in netdev */
+	at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/netdev", __FUNCTION__);
+	free_netdev(priv->netdev); /* priv is in netdev */
 
 	at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __FUNCTION__);
 }
 
 
-static int at76_alloc_urbs(struct at76_priv *dev)
+static int at76_alloc_urbs(struct at76_priv *priv)
 {
-	struct usb_interface *interface = dev->interface;
+	struct usb_interface *interface = priv->interface;
 	struct usb_endpoint_descriptor *endpoint;
-	struct usb_device *udev = dev->udev;
+	struct usb_device *udev = priv->udev;
 	int i, buffer_size;
 	struct usb_host_interface *iface_desc;
 
@@ -2415,45 +2415,45 @@ static int at76_alloc_urbs(struct at76_priv *dev)
 		    ((endpoint->bmAttributes & 3) == 0x02)) {
 			/* we found a bulk in endpoint */
 
-			dev->read_urb = usb_alloc_urb(0, GFP_KERNEL);
-			if (!dev->read_urb) {
+			priv->read_urb = usb_alloc_urb(0, GFP_KERNEL);
+			if (!priv->read_urb) {
 				err("No free urbs available");
 				return -ENOMEM;
 			}
-			dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
+			priv->bulk_in_endpointAddr = endpoint->bEndpointAddress;
 		}
 
 		if (((endpoint->bEndpointAddress & 0x80) == 0x00) &&
 		    ((endpoint->bmAttributes & 3) == 0x02)) {
 			/* we found a bulk out endpoint */
-			dev->write_urb = usb_alloc_urb(0, GFP_KERNEL);
-			if (!dev->write_urb) {
+			priv->write_urb = usb_alloc_urb(0, GFP_KERNEL);
+			if (!priv->write_urb) {
 				err("no free urbs available");
 				return -ENOMEM;
 			}
 			buffer_size = sizeof(struct at76_tx_buffer) +
 			    MAX_PADDING_SIZE;
-			dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
-			dev->bulk_out_buffer = kmalloc(buffer_size, GFP_KERNEL);
-			if (!dev->bulk_out_buffer) {
+			priv->bulk_out_endpointAddr = endpoint->bEndpointAddress;
+			priv->bulk_out_buffer = kmalloc(buffer_size, GFP_KERNEL);
+			if (!priv->bulk_out_buffer) {
 				err("couldn't allocate bulk_out_buffer");
 				return -ENOMEM;
 			}
-			usb_fill_bulk_urb(dev->write_urb, udev,
+			usb_fill_bulk_urb(priv->write_urb, udev,
 				          usb_sndbulkpipe(udev,
 						      endpoint->bEndpointAddress),
-				          dev->bulk_out_buffer, buffer_size,
-				          at76_write_bulk_callback, dev);
+				          priv->bulk_out_buffer, buffer_size,
+				          at76_write_bulk_callback, priv);
 		}
 	}
 
-	dev->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
-	if (!dev->ctrl_urb) {
+	priv->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
+	if (!priv->ctrl_urb) {
 		err("no free urbs available");
 		return -ENOMEM;
 	}
-	dev->ctrl_buffer = kmalloc(1024, GFP_KERNEL);
-	if (!dev->ctrl_buffer) {
+	priv->ctrl_buffer = kmalloc(1024, GFP_KERNEL);
+	if (!priv->ctrl_buffer) {
 		err("couldn't allocate ctrl_buffer");
 		return -ENOMEM;
 	}
@@ -2476,33 +2476,33 @@ static int at76_set_mac_address(struct net_device *netdev, void *addr)
 
 static struct net_device_stats *at76_get_stats(struct net_device *netdev)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
-	return &dev->stats;
+	struct at76_priv *priv = netdev_priv(netdev);
+	return &priv->stats;
 }
 
 
 static struct iw_statistics *at76_get_wireless_stats(struct net_device *netdev)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
 	at76_dbg(DBG_IOCTL, "RETURN qual %d level %d noise %d updated %d",
-	         dev->wstats.qual.qual, dev->wstats.qual.level,
-	         dev->wstats.qual.noise, dev->wstats.qual.updated);
+	         priv->wstats.qual.qual, priv->wstats.qual.level,
+	         priv->wstats.qual.noise, priv->wstats.qual.updated);
 
-	return &dev->wstats;
+	return &priv->wstats;
 }
 
 
 static void at76_set_multicast(struct net_device *netdev)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int promisc;
 
 	promisc = ((netdev->flags & IFF_PROMISC) != 0);
-	if (promisc != dev->promisc) {
+	if (promisc != priv->promisc) {
 		/* grmbl. This gets called in interrupt. */
-		dev->promisc = promisc;
-		schedule_work(&dev->work_set_promisc);
+		priv->promisc = promisc;
+		schedule_work(&priv->work_set_promisc);
 	}
 }
 
@@ -2514,32 +2514,32 @@ static int at76_iw_handler_commit(struct net_device *netdev,
 				  struct iw_request_info *info,
 				  void *null, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	unsigned long flags;
 	at76_dbg(DBG_IOCTL, "%s %s: restarting the device", netdev->name,
 	         __FUNCTION__);
 
 	/* TODO: stop any pending tx bulk urb */
-	if (dev->istate != INIT) {
-		dev->istate = INIT;
+	if (priv->istate != INIT) {
+		priv->istate = INIT;
 		/* stop pending management stuff */
-		del_timer_sync(&dev->mgmt_timer);
+		del_timer_sync(&priv->mgmt_timer);
 
-		spin_lock_irqsave(&dev->mgmt_spinlock, flags);
-		if (dev->next_mgmt_bulk) {
-			kfree(dev->next_mgmt_bulk);
-			dev->next_mgmt_bulk = NULL;
+		spin_lock_irqsave(&priv->mgmt_spinlock, flags);
+		if (priv->next_mgmt_bulk) {
+			kfree(priv->next_mgmt_bulk);
+			priv->next_mgmt_bulk = NULL;
 		}
-		spin_unlock_irqrestore(&dev->mgmt_spinlock, flags);
+		spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
 
-		netif_carrier_off(dev->netdev);
-		netif_stop_queue(dev->netdev);
+		netif_carrier_off(priv->netdev);
+		netif_stop_queue(priv->netdev);
 	}
 
 	/* do the restart after two seconds to catch
 	 * following ioctl's (from more params of iwconfig)
 	 * in _one_ restart */
-	mod_timer(&dev->restart_timer, jiffies + 2 * HZ);
+	mod_timer(&priv->restart_timer, jiffies + 2 * HZ);
 
 	return 0;
 }
@@ -2559,7 +2559,7 @@ static int at76_iw_handler_set_freq(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    struct iw_freq *freq, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int chan = -1;
 	int ret = -EIWCOMMIT;
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - freq.m %d freq.e %d", netdev->name,
@@ -2583,23 +2583,23 @@ static int at76_iw_handler_set_freq(struct net_device *netdev,
 		}
 	}
 
-	if (chan < 1 || !dev->domain) {
+	if (chan < 1 || !priv->domain) {
 		/* non-positive channels are invalid
 		 * we need a domain info to set the channel
 		 * either that or an invalid frequency was
 		 * provided by the user */
 		ret = -EINVAL;
-	} else if (!dev->international_roaming) {
-		if (!(dev->domain->channel_map & (1 << (chan - 1)))) {
+	} else if (!priv->international_roaming) {
+		if (!(priv->domain->channel_map & (1 << (chan - 1)))) {
 			info("%s: channel %d not allowed for domain %s "
 			     "(and international_roaming is OFF)",
-			     dev->netdev->name, chan, dev->domain->name);
+			     priv->netdev->name, chan, priv->domain->name);
 			ret = -EINVAL;
 		}
 	}
 
 	if (ret == -EIWCOMMIT) {
-		dev->channel = chan;
+		priv->channel = chan;
 		at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - ch %d", netdev->name, chan);
 	}
 
@@ -2611,16 +2611,16 @@ static int at76_iw_handler_get_freq(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    struct iw_freq *freq, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
-	freq->m = dev->channel;
+	freq->m = priv->channel;
 	freq->e = 0;
 
-	if (dev->channel) {
+	if (priv->channel) {
 		at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - freq %ld x 10e%d",
-		         netdev->name, channel_frequency[dev->channel - 1], 6);
+		         netdev->name, channel_frequency[priv->channel - 1], 6);
 	}
-	at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - ch %d", netdev->name, dev->channel);
+	at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - ch %d", netdev->name, priv->channel);
 
 	return 0;
 }
@@ -2630,7 +2630,7 @@ static int at76_iw_handler_set_mode(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    __u32 *mode, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = -EIWCOMMIT;
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWMODE - %d", netdev->name, *mode);
@@ -2639,9 +2639,9 @@ static int at76_iw_handler_set_mode(struct net_device *netdev,
 	    (*mode != IW_MODE_MONITOR)) {
 		ret = -EINVAL;
 	} else {
-		dev->iw_mode = *mode;
-		if( dev->iw_mode != IW_MODE_INFRA)
-			dev->pm_mode = AT76_PM_OFF;
+		priv->iw_mode = *mode;
+		if( priv->iw_mode != IW_MODE_INFRA)
+			priv->pm_mode = AT76_PM_OFF;
 	}
 	return ret;
 }
@@ -2651,9 +2651,9 @@ static int at76_iw_handler_get_mode(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    __u32 * mode, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
-	*mode = dev->iw_mode;
+	*mode = priv->iw_mode;
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCGIWMODE - %d", netdev->name, *mode);
 
@@ -2666,7 +2666,7 @@ static int at76_iw_handler_get_range(struct net_device *netdev,
 				     struct iw_point *data, char *extra)
 {
 	/* inspired by atmel.c */
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	struct iw_range *range = (struct iw_range *)extra;
 	int i;
 
@@ -2734,7 +2734,7 @@ static int at76_iw_handler_get_range(struct net_device *netdev,
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
 		/* test if channel map bit is raised */
-		if (dev->domain->channel_map & (0x1 << i)) {
+		if (priv->domain->channel_map & (0x1 << i)) {
 			range->num_frequency += 1;
 
 			range->freq[i].i = i + 1;
@@ -2753,16 +2753,16 @@ static int at76_iw_handler_set_spy(struct net_device *netdev,
 				   struct iw_request_info *info,
 				   struct iw_point *data, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = 0;
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWSPY - number of addresses %d",
 	         netdev->name, data->length);
 
-	spin_lock_bh(&(dev->spy_spinlock));
-	ret = iw_handler_set_spy(dev->netdev, info, (union iwreq_data *)data,
+	spin_lock_bh(&(priv->spy_spinlock));
+	ret = iw_handler_set_spy(priv->netdev, info, (union iwreq_data *)data,
 				 extra);
-	spin_unlock_bh(&(dev->spy_spinlock));
+	spin_unlock_bh(&(priv->spy_spinlock));
 
 	return ret;
 }
@@ -2773,13 +2773,13 @@ static int at76_iw_handler_get_spy(struct net_device *netdev,
 				   struct iw_point *data, char *extra)
 {
 
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = 0;
 
-	spin_lock_bh(&(dev->spy_spinlock));
-	ret = iw_handler_get_spy(dev->netdev, info,
+	spin_lock_bh(&(priv->spy_spinlock));
+	ret = iw_handler_get_spy(priv->netdev, info,
 				 (union iwreq_data *)data, extra);
-	spin_unlock_bh(&(dev->spy_spinlock));
+	spin_unlock_bh(&(priv->spy_spinlock));
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCGIWSPY - number of addresses %d",
 	         netdev->name, data->length);
@@ -2792,16 +2792,16 @@ static int at76_iw_handler_set_thrspy(struct net_device *netdev,
 				      struct iw_request_info *info,
 				      struct iw_point *data, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret;
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWTHRSPY - number of addresses %d)",
 	         netdev->name, data->length);
 
-	spin_lock_bh(&(dev->spy_spinlock));
+	spin_lock_bh(&(priv->spy_spinlock));
 	ret = iw_handler_set_thrspy(netdev, info, (union iwreq_data *)data,
 				    extra);
-	spin_unlock_bh(&(dev->spy_spinlock));
+	spin_unlock_bh(&(priv->spy_spinlock));
 
 	return ret;
 }
@@ -2811,13 +2811,13 @@ static int at76_iw_handler_get_thrspy(struct net_device *netdev,
 				      struct iw_request_info *info,
 				      struct iw_point *data, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret;
 
-	spin_lock_bh(&(dev->spy_spinlock));
+	spin_lock_bh(&(priv->spy_spinlock));
 	ret = iw_handler_get_thrspy(netdev, info, (union iwreq_data *)data,
 				    extra);
-	spin_unlock_bh(&(dev->spy_spinlock));
+	spin_unlock_bh(&(priv->spy_spinlock));
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCGIWTHRSPY - number of addresses %d)",
 	         netdev->name, data->length);
@@ -2830,7 +2830,7 @@ static int at76_iw_handler_set_wap(struct net_device *netdev,
 				   struct iw_request_info *info,
 				   struct sockaddr *ap_addr, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWAP - wap/bssid %s", netdev->name,
 	         mac2str(ap_addr->sa_data));
@@ -2839,11 +2839,11 @@ static int at76_iw_handler_set_wap(struct net_device *netdev,
 	   chosen any or auto AP preference */
 	if (is_broadcast_ether_addr(ap_addr->sa_data)
 	    || is_zero_ether_addr(ap_addr->sa_data)) {
-		dev->wanted_bssid_valid = 0;
+		priv->wanted_bssid_valid = 0;
 	} else {
 		/* user wants to set a preferred AP address */
-		dev->wanted_bssid_valid = 1;
-		memcpy(dev->wanted_bssid, ap_addr->sa_data, ETH_ALEN);
+		priv->wanted_bssid_valid = 1;
+		memcpy(priv->wanted_bssid, ap_addr->sa_data, ETH_ALEN);
 	}
 
 	return -EIWCOMMIT;
@@ -2854,10 +2854,10 @@ static int at76_iw_handler_get_wap(struct net_device *netdev,
 				   struct iw_request_info *info,
 				   struct sockaddr *ap_addr, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
 	ap_addr->sa_family = ARPHRD_ETHER;
-	memcpy(ap_addr->sa_data, dev->bssid, ETH_ALEN);
+	memcpy(ap_addr->sa_data, priv->bssid, ETH_ALEN);
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCGIWAP - wap/bssid %s", netdev->name,
 	         mac2str(ap_addr->sa_data));
@@ -2870,7 +2870,7 @@ static int at76_iw_handler_set_scan(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    union iwreq_data *wrqu, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	unsigned long flags;
 	int ret = 0;
 	struct iw_scan_req *req = NULL;
@@ -2882,34 +2882,34 @@ static int at76_iw_handler_set_scan(struct net_device *netdev,
 
 	/* jal: we don't allow "iwlist ethX scan" while we are
 	   in monitor mode */
-	if (dev->iw_mode == IW_MODE_MONITOR)
+	if (priv->iw_mode == IW_MODE_MONITOR)
 		return -EBUSY;
 
 	/* Discard old scan results */
-	if ((jiffies - dev->last_scan) > (20 * HZ))
-		dev->scan_state = SCAN_IDLE;
-	dev->last_scan = jiffies;
+	if ((jiffies - priv->last_scan) > (20 * HZ))
+		priv->scan_state = SCAN_IDLE;
+	priv->last_scan = jiffies;
 
 	/* Initiate a scan command */
-	if (dev->scan_state == SCAN_IN_PROGRESS)
+	if (priv->scan_state == SCAN_IN_PROGRESS)
 		return -EBUSY;
 
-	dev->scan_state = SCAN_IN_PROGRESS;
+	priv->scan_state = SCAN_IN_PROGRESS;
 
 	/* stop pending management stuff */
-	del_timer_sync(&(dev->mgmt_timer));
+	del_timer_sync(&(priv->mgmt_timer));
 
-	spin_lock_irqsave(&(dev->mgmt_spinlock), flags);
-	if (dev->next_mgmt_bulk) {
-		kfree(dev->next_mgmt_bulk);
-		dev->next_mgmt_bulk = NULL;
+	spin_lock_irqsave(&(priv->mgmt_spinlock), flags);
+	if (priv->next_mgmt_bulk) {
+		kfree(priv->next_mgmt_bulk);
+		priv->next_mgmt_bulk = NULL;
 	}
-	spin_unlock_irqrestore(&(dev->mgmt_spinlock), flags);
+	spin_unlock_irqrestore(&(priv->mgmt_spinlock), flags);
 
-	if (netif_running(dev->netdev)) {
+	if (netif_running(priv->netdev)) {
 		/* pause network activity */
-		netif_carrier_off(dev->netdev);
-		netif_stop_queue(dev->netdev);
+		netif_carrier_off(priv->netdev);
+		netif_stop_queue(priv->netdev);
 	}
 	/* Try to do passive or active scan if WE asks as. */
 	if (wrqu->data.length
@@ -2917,30 +2917,30 @@ static int at76_iw_handler_set_scan(struct net_device *netdev,
 		req = (struct iw_scan_req *)extra;
 
 		if (req->scan_type == IW_SCAN_TYPE_PASSIVE)
-			dev->scan_mode = SCAN_TYPE_PASSIVE;
+			priv->scan_mode = SCAN_TYPE_PASSIVE;
 		else if (req->scan_type == IW_SCAN_TYPE_ACTIVE)
-			dev->scan_mode = SCAN_TYPE_ACTIVE;
+			priv->scan_mode = SCAN_TYPE_ACTIVE;
 
 		/* Sanity check values? */
 		if (req->min_channel_time > 0) {
-			if (dev->istate == MONITORING)
-				dev->monitor_scan_min_time =
+			if (priv->istate == MONITORING)
+				priv->monitor_scan_min_time =
 				    req->min_channel_time;
 			else
-				dev->scan_min_time = req->min_channel_time;
+				priv->scan_min_time = req->min_channel_time;
 		}
 		if (req->max_channel_time > 0) {
-			if (dev->istate == MONITORING)
-				dev->monitor_scan_max_time =
+			if (priv->istate == MONITORING)
+				priv->monitor_scan_max_time =
 				    req->max_channel_time;
 			else
-				dev->scan_max_time = req->max_channel_time;
+				priv->scan_max_time = req->max_channel_time;
 		}
 	}
 
 	/* change to scanning state */
-	dev->istate = SCANNING;
-	schedule_work(&dev->work_scan);
+	priv->istate = SCANNING;
+	schedule_work(&priv->work_scan);
 
 	return ret;
 }
@@ -2950,7 +2950,7 @@ static int at76_iw_handler_get_scan(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    struct iw_point *data, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	unsigned long flags;
 	struct list_head *lptr, *nptr;
 	struct bss_info *curr_bss;
@@ -2963,13 +2963,13 @@ static int at76_iw_handler_get_scan(struct net_device *netdev,
 	if (!iwe)
 		return -ENOMEM;
 
-	if (dev->scan_state != SCAN_COMPLETED)
+	if (priv->scan_state != SCAN_COMPLETED)
 		/* scan not yet finished */
 		return -EAGAIN;
 
-	spin_lock_irqsave(&(dev->bss_list_spinlock), flags);
+	spin_lock_irqsave(&(priv->bss_list_spinlock), flags);
 
-	list_for_each_safe(lptr, nptr, &(dev->bss_list)) {
+	list_for_each_safe(lptr, nptr, &(priv->bss_list)) {
 		curr_bss = list_entry(lptr, struct bss_info, list);
 
 		iwe->cmd = SIOCGIWAP;
@@ -3023,8 +3023,8 @@ static int at76_iw_handler_get_scan(struct net_device *netdev,
 		iwe->u.qual.level = (curr_bss->rssi * 100 / 42);
 		if (iwe->u.qual.level > 100)
 			iwe->u.qual.level = 100;
-		if ((dev->board_type == BOARDTYPE_503_INTERSIL_3861) ||
-		    (dev->board_type == BOARDTYPE_503_INTERSIL_3863)) {
+		if ((priv->board_type == BOARDTYPE_503_INTERSIL_3861) ||
+		    (priv->board_type == BOARDTYPE_503_INTERSIL_3863)) {
 			iwe->u.qual.qual = curr_bss->link_qual;
 		} else {
 			iwe->u.qual.qual = 0;
@@ -3062,7 +3062,7 @@ static int at76_iw_handler_get_scan(struct net_device *netdev,
 
 	}
 
-	spin_unlock_irqrestore(&(dev->bss_list_spinlock), flags);
+	spin_unlock_irqrestore(&(priv->bss_list_spinlock), flags);
 
 	data->length = (curr_pos - extra);
 	data->flags = 0;
@@ -3076,16 +3076,16 @@ static int at76_iw_handler_set_essid(struct net_device *netdev,
 				     struct iw_request_info *info,
 				     struct iw_point *data, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWESSID - %s", netdev->name, extra);
 
 	if (data->flags) {
-		memcpy(dev->essid, extra, data->length);
-		dev->essid_size = data->length;
+		memcpy(priv->essid, extra, data->length);
+		priv->essid_size = data->length;
 	} else {
 		/* Use any SSID */
-		dev->essid_size = 0;
+		priv->essid_size = 0;
 	}
 
 	return -EIWCOMMIT;
@@ -3096,23 +3096,23 @@ static int at76_iw_handler_get_essid(struct net_device *netdev,
 				     struct iw_request_info *info,
 				     struct iw_point *data, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
-	if (dev->essid_size) {
-		/* not the ANY ssid in dev->essid */
+	if (priv->essid_size) {
+		/* not the ANY ssid in priv->essid */
 		data->flags = 1;
-		data->length = dev->essid_size;
-		memcpy(extra, dev->essid, data->length);
+		data->length = priv->essid_size;
+		memcpy(extra, priv->essid, data->length);
 		extra[data->length] = '\0';
 		data->length += 1;
 	} else {
 		/* the ANY ssid was specified */
-		if (dev->istate == CONNECTED && dev->curr_bss != NULL) {
+		if (priv->istate == CONNECTED && priv->curr_bss != NULL) {
 			/* report the SSID we have found */
 			data->flags = 1;
-			data->length = dev->curr_bss->ssid_len;
-			memcpy(extra, dev->curr_bss->ssid, data->length);
-			extra[dev->curr_bss->ssid_len] = '\0';
+			data->length = priv->curr_bss->ssid_len;
+			memcpy(extra, priv->curr_bss->ssid, data->length);
+			extra[priv->curr_bss->ssid_len] = '\0';
 			data->length += 1;
 		} else {
 			/* report ANY back */
@@ -3131,26 +3131,26 @@ static int at76_iw_handler_set_rate(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    struct iw_param *bitrate, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = -EIWCOMMIT;
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWRATE - %d", netdev->name, bitrate->value);
 
 	switch (bitrate->value) {
 	case -1:
-		dev->txrate = TX_RATE_AUTO;
+		priv->txrate = TX_RATE_AUTO;
 		break;		/* auto rate */
 	case 1000000:
-		dev->txrate = TX_RATE_1MBIT;
+		priv->txrate = TX_RATE_1MBIT;
 		break;
 	case 2000000:
-		dev->txrate = TX_RATE_2MBIT;
+		priv->txrate = TX_RATE_2MBIT;
 		break;
 	case 5500000:
-		dev->txrate = TX_RATE_5_5MBIT;
+		priv->txrate = TX_RATE_5_5MBIT;
 		break;
 	case 11000000:
-		dev->txrate = TX_RATE_11MBIT;
+		priv->txrate = TX_RATE_11MBIT;
 		break;
 	default:
 		ret = -EINVAL;
@@ -3164,10 +3164,10 @@ static int at76_iw_handler_get_rate(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    struct iw_param *bitrate, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = 0;
 
-	switch (dev->txrate) {
+	switch (priv->txrate) {
 		/* return max rate if RATE_AUTO */
 	case TX_RATE_AUTO:
 		bitrate->value = 11000000;
@@ -3188,7 +3188,7 @@ static int at76_iw_handler_get_rate(struct net_device *netdev,
 		ret = -EINVAL;
 	}
 
-	bitrate->fixed = (dev->txrate != TX_RATE_AUTO);
+	bitrate->fixed = (priv->txrate != TX_RATE_AUTO);
 	bitrate->disabled = 0;
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCGIWRATE - %d", netdev->name,
@@ -3202,7 +3202,7 @@ static int at76_iw_handler_set_rts(struct net_device *netdev,
 				   struct iw_request_info *info,
 				   struct iw_param *rts, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = -EIWCOMMIT;
 	int rthr = rts->value;
 
@@ -3215,7 +3215,7 @@ static int at76_iw_handler_set_rts(struct net_device *netdev,
 	if ((rthr < 0) || (rthr > MAX_RTS_THRESHOLD)) {
 		ret = -EINVAL;
 	} else {
-		dev->rts_threshold = rthr;
+		priv->rts_threshold = rthr;
 	}
 
 	return ret;
@@ -3226,9 +3226,9 @@ static int at76_iw_handler_get_rts(struct net_device *netdev,
 				   struct iw_request_info *info,
 				   struct iw_param *rts, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
-	rts->value = dev->rts_threshold;
+	rts->value = priv->rts_threshold;
 	rts->disabled = (rts->value >= MAX_RTS_THRESHOLD);
 	rts->fixed = 1;
 
@@ -3243,7 +3243,7 @@ static int at76_iw_handler_set_frag(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    struct iw_param *frag, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = -EIWCOMMIT;
 	int fthr = frag->value;
 
@@ -3256,7 +3256,7 @@ static int at76_iw_handler_set_frag(struct net_device *netdev,
 	if ((fthr < MIN_FRAG_THRESHOLD) || (fthr > MAX_FRAG_THRESHOLD)) {
 		ret = -EINVAL;
 	} else {
-		dev->frag_threshold = fthr & ~0x1; /* get an even value */
+		priv->frag_threshold = fthr & ~0x1; /* get an even value */
 	}
 
 	return ret;
@@ -3267,9 +3267,9 @@ static int at76_iw_handler_get_frag(struct net_device *netdev,
 				    struct iw_request_info *info,
 				    struct iw_param *frag, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
-	frag->value = dev->frag_threshold;
+	frag->value = priv->frag_threshold;
 	frag->disabled = (frag->value >= MAX_FRAG_THRESHOLD);
 	frag->fixed = 1;
 
@@ -3302,7 +3302,7 @@ static int at76_iw_handler_set_retry(struct net_device *netdev,
 				     struct iw_request_info *info,
 				     struct iw_param *retry, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = -EIWCOMMIT;
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWRETRY disabled %d  flags x%x val %d",
@@ -3311,7 +3311,7 @@ static int at76_iw_handler_set_retry(struct net_device *netdev,
 	if (!retry->disabled && (retry->flags & IW_RETRY_LIMIT)) {
 		if ((retry->flags & IW_RETRY_MIN) ||
 		    !(retry->flags & IW_RETRY_MAX)) {
-			dev->short_retry_limit = retry->value;
+			priv->short_retry_limit = retry->value;
 		} else
 			ret = -EINVAL;
 	} else {
@@ -3327,7 +3327,7 @@ static int at76_iw_handler_get_retry(struct net_device *netdev,
 				     struct iw_request_info *info,
 				     struct iw_param *retry, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCGIWRETRY", netdev->name);
 
@@ -3335,7 +3335,7 @@ static int at76_iw_handler_get_retry(struct net_device *netdev,
 
 
 	retry->flags = IW_RETRY_LIMIT;
-	retry->value = dev->short_retry_limit;
+	retry->value = priv->short_retry_limit;
 
 	return 0;
 }
@@ -3346,7 +3346,7 @@ static int at76_iw_handler_set_encode(struct net_device *netdev,
 				      struct iw_point *encoding,
 				      char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int index = (encoding->flags & IW_ENCODE_INDEX) - 1;
 	int len = encoding->length;
 
@@ -3355,38 +3355,38 @@ static int at76_iw_handler_set_encode(struct net_device *netdev,
 	         encoding->pointer, encoding->length);
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWENCODE - old wepstate: enabled %s key_id %d "
 	         "auth_mode %s",
-	         netdev->name, (dev->wep_enabled) ? "true" : "false",
-	         dev->wep_key_id,
-	         (dev->auth_mode == WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
+	         netdev->name, (priv->wep_enabled) ? "true" : "false",
+	         priv->wep_key_id,
+	         (priv->auth_mode == WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
 
 	/* take the old default key if index is invalid */
 	if ((index < 0) || (index >= WEP_KEYS))
-		index = dev->wep_key_id;
+		index = priv->wep_key_id;
 
 	if (len > 0) {
 		if (len > WEP_LARGE_KEY_LEN)
 			len = WEP_LARGE_KEY_LEN;
 
-		memset(dev->wep_keys[index], 0, WEP_KEY_LEN);
-		memcpy(dev->wep_keys[index], extra, len);
-		dev->wep_keys_len[index] = (len <= WEP_SMALL_KEY_LEN) ?
+		memset(priv->wep_keys[index], 0, WEP_KEY_LEN);
+		memcpy(priv->wep_keys[index], extra, len);
+		priv->wep_keys_len[index] = (len <= WEP_SMALL_KEY_LEN) ?
 		    WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;
-		dev->wep_enabled = 1;
+		priv->wep_enabled = 1;
 	}
 
-	dev->wep_key_id = index;
-	dev->wep_enabled = ((encoding->flags & IW_ENCODE_DISABLED) == 0);
+	priv->wep_key_id = index;
+	priv->wep_enabled = ((encoding->flags & IW_ENCODE_DISABLED) == 0);
 
 	if (encoding->flags & IW_ENCODE_RESTRICTED)
-		dev->auth_mode = WLAN_AUTH_SHARED_KEY;
+		priv->auth_mode = WLAN_AUTH_SHARED_KEY;
 	if (encoding->flags & IW_ENCODE_OPEN)
-		dev->auth_mode = WLAN_AUTH_OPEN;
+		priv->auth_mode = WLAN_AUTH_OPEN;
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWENCODE - new wepstate: enabled %s key_id %d "
 	         "key_len %d auth_mode %s",
-	         netdev->name, (dev->wep_enabled) ? "true" : "false",
-	         dev->wep_key_id + 1, dev->wep_keys_len[dev->wep_key_id],
-	         (dev->auth_mode == WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
+	         netdev->name, (priv->wep_enabled) ? "true" : "false",
+	         priv->wep_key_id + 1, priv->wep_keys_len[priv->wep_key_id],
+	         (priv->auth_mode == WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
 
 	return -EIWCOMMIT;
 }
@@ -3397,23 +3397,23 @@ static int at76_iw_handler_get_encode(struct net_device *netdev,
 				      struct iw_point *encoding,
 				      char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int index = (encoding->flags & IW_ENCODE_INDEX) - 1;
 
 	if ((index < 0) || (index >= WEP_KEYS))
-		index = dev->wep_key_id;
+		index = priv->wep_key_id;
 
 	encoding->flags =
-	    (dev->auth_mode == WLAN_AUTH_SHARED_KEY) ?
+	    (priv->auth_mode == WLAN_AUTH_SHARED_KEY) ?
 	    IW_ENCODE_RESTRICTED : IW_ENCODE_OPEN;
 
-	if (!dev->wep_enabled)
+	if (!priv->wep_enabled)
 		encoding->flags |= IW_ENCODE_DISABLED;
 
 	if (encoding->pointer) {
-		encoding->length = dev->wep_keys_len[index];
+		encoding->length = priv->wep_keys_len[index];
 
-		memcpy(extra, dev->wep_keys[index], dev->wep_keys_len[index]);
+		memcpy(extra, priv->wep_keys[index], priv->wep_keys_len[index]);
 
 		encoding->flags |= (index + 1);
 	}
@@ -3423,9 +3423,9 @@ static int at76_iw_handler_get_encode(struct net_device *netdev,
 		encoding->pointer, encoding->length);
 	at76_dbg(DBG_IOCTL, "%s: SIOCGIWENCODE - wepstate: enabled %s key_id %d "
 		"key_len %d auth_mode %s",
-		netdev->name, (dev->wep_enabled) ? "true" : "false",
-		dev->wep_key_id + 1, dev->wep_keys_len[dev->wep_key_id],
-		(dev->auth_mode == WLAN_AUTH_SHARED_KEY) ?
+		netdev->name, (priv->wep_enabled) ? "true" : "false",
+		priv->wep_key_id + 1, priv->wep_keys_len[priv->wep_key_id],
+		(priv->auth_mode == WLAN_AUTH_SHARED_KEY) ?
 			"restricted" : "open");
 
 	return 0;
@@ -3437,14 +3437,14 @@ static int at76_iw_handler_set_power(struct net_device *netdev,
 				     struct iw_param *prq, char *extra)
 {
 	int err = -EIWCOMMIT;
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
 	at76_dbg(DBG_IOCTL, "%s: SIOCSIWPOWER - disabled %s flags x%x value x%x",
 		 netdev->name, (prq->disabled) ? "true" : "false",
 		 prq->flags, prq->value);
 
 	if (prq->disabled) {
-		dev->pm_mode = AT76_PM_OFF;
+		priv->pm_mode = AT76_PM_OFF;
 	} else {
 		switch (prq->flags & IW_POWER_MODE) {
                 case IW_POWER_ALL_R:
@@ -3455,13 +3455,13 @@ static int at76_iw_handler_set_power(struct net_device *netdev,
 			goto out;
 		}
 		if (prq->flags & IW_POWER_PERIOD) {
-			dev->pm_period = prq->value;
+			priv->pm_period = prq->value;
 		}
 		if (prq->flags & IW_POWER_TIMEOUT) {
 			err = -EINVAL;
 			goto out;
 		}
-		dev->pm_mode = AT76_PM_ON;
+		priv->pm_mode = AT76_PM_ON;
 	}
 out:
 	return err;
@@ -3472,13 +3472,13 @@ static int at76_iw_handler_get_power(struct net_device *netdev,
 				     struct iw_request_info *info,
 				     struct iw_param *power, char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
-	if ((power->disabled = (dev->pm_mode == AT76_PM_OFF)))
+	if ((power->disabled = (priv->pm_mode == AT76_PM_OFF)))
 		return 0;
 	else {
 		power->flags = IW_POWER_PERIOD;
-		power->value = dev->pm_period;
+		power->value = priv->pm_period;
 	}
 	power->flags |= IW_POWER_ALL_R;
 
@@ -3497,7 +3497,7 @@ static int at76_iw_set_short_preamble(struct net_device *netdev,
 				      struct iw_request_info *info, char *name,
 				      char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int val = *((int *)name);
 	int ret = -EIWCOMMIT;
 
@@ -3509,7 +3509,7 @@ static int at76_iw_set_short_preamble(struct net_device *netdev,
 		   for "auto preamble" ...? */
 		ret = -EINVAL;
 	} else {
-		dev->preamble_type = val;
+		priv->preamble_type = val;
 	}
 
 	return ret;
@@ -3555,7 +3555,7 @@ static int at76_iw_set_powersave_mode(struct net_device *netdev,
 				      struct iw_request_info *info, char *name,
 				      char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int val = *((int *)name);
 	int ret = -EIWCOMMIT;
 
@@ -3566,7 +3566,7 @@ static int at76_iw_set_powersave_mode(struct net_device *netdev,
 	if (val < AT76_PM_OFF || val > AT76_PM_SMART) {
 		ret = -EINVAL;
 	} else {
-		dev->pm_mode = val;
+		priv->pm_mode = val;
 	}
 
 	return ret;
@@ -3577,7 +3577,7 @@ static int at76_iw_set_scan_times(struct net_device *netdev,
 				  struct iw_request_info *info, char *name,
 				  char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int mint = *((int *)name);
 	int maxt = *((int *)name + 1);
 	int ret = -EIWCOMMIT;
@@ -3587,13 +3587,13 @@ static int at76_iw_set_scan_times(struct net_device *netdev,
 	if (mint <= 0 || maxt <= 0 || mint > maxt) {
 		ret = -EINVAL;
 	} else {
-		if (dev->istate == MONITORING) {
-			dev->monitor_scan_min_time = mint;
-			dev->monitor_scan_max_time = maxt;
+		if (priv->istate == MONITORING) {
+			priv->monitor_scan_min_time = mint;
+			priv->monitor_scan_max_time = maxt;
 			ret = 0;
 		} else {
-			dev->scan_min_time = mint;
-			dev->scan_max_time = maxt;
+			priv->scan_min_time = mint;
+			priv->scan_max_time = maxt;
 		}
 	}
 
@@ -3605,7 +3605,7 @@ static int at76_iw_set_scan_mode(struct net_device *netdev,
 				 struct iw_request_info *info, char *name,
 				 char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int val = *((int *)name);
 	int ret = -EIWCOMMIT;
 
@@ -3616,25 +3616,25 @@ static int at76_iw_set_scan_mode(struct net_device *netdev,
 	if (val != SCAN_TYPE_ACTIVE && val != SCAN_TYPE_PASSIVE) {
 		ret = -EINVAL;
 	} else {
-		dev->scan_mode = val;
+		priv->scan_mode = val;
 	}
 
 	return ret;
 }
 
 
-static int at76_set_iroaming(struct at76_priv *dev, int onoff)
+static int at76_set_iroaming(struct at76_priv *priv, int onoff)
 {
 	int ret = 0;
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC_MGMT;
-	dev->mib_buf.size = 1;
-	dev->mib_buf.index = IROAMING_OFFSET;
-	dev->mib_buf.data[0] = (dev->international_roaming ? 1 : 0);
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC_MGMT;
+	priv->mib_buf.size = 1;
+	priv->mib_buf.index = IROAMING_OFFSET;
+	priv->mib_buf.data[0] = (priv->international_roaming ? 1 : 0);
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
-		err("%s: set_mib (intl_roaming_enable) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (intl_roaming_enable) failed: %d", priv->netdev->name, ret);
 	}
 
 	return ret;
@@ -3645,7 +3645,7 @@ static int at76_iw_set_intl_roaming(struct net_device *netdev,
 				    struct iw_request_info *info, char *name,
 				    char *extra)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int val = *((int *)name);
 	int ret = -EIWCOMMIT;
 
@@ -3656,9 +3656,9 @@ static int at76_iw_set_intl_roaming(struct net_device *netdev,
 	if (val != IR_OFF && val != IR_ON) {
 		ret = -EINVAL;
 	} else {
-		if (dev->international_roaming != val) {
-			dev->international_roaming = val;
-			at76_set_iroaming(dev, val);
+		if (priv->international_roaming != val) {
+			priv->international_roaming = val;
+			at76_set_iroaming(priv, val);
 		}
 	}
 
@@ -3813,12 +3813,12 @@ static const u8 rfc1042sig[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
 
 static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
-	struct net_device_stats *stats = &dev->stats;
+	struct at76_priv *priv = netdev_priv(netdev);
+	struct net_device_stats *stats = &priv->stats;
 	int ret = 0;
 	int wlen;
 	int submit_len;
-	struct at76_tx_buffer *tx_buffer = dev->bulk_out_buffer;
+	struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer;
 	struct ieee80211_hdr_3addr *i802_11_hdr =
 	    (struct ieee80211_hdr_3addr *)&(tx_buffer->packet);
 	u8 *payload = tx_buffer->packet + sizeof(struct ieee80211_hdr_3addr);
@@ -3831,8 +3831,8 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 		return 0;
 	}
 
-	if (dev->write_urb->status == -EINPROGRESS) {
-		err("%s: %s called while dev->write_urb is pending for tx",
+	if (priv->write_urb->status == -EINPROGRESS) {
+		err("%s: %s called while priv->write_urb is pending for tx",
 		    netdev->name, __FUNCTION__);
 		/* skip this packet */
 		dev_kfree_skb(skb);
@@ -3840,7 +3840,7 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 	}
 
 	if (skb->len < 2 * ETH_ALEN) {
-		err("%s: %s: skb too short (%d)", dev->netdev->name,
+		err("%s: %s: skb too short (%d)", priv->netdev->name,
 		    __FUNCTION__, skb->len);
 		dev_kfree_skb(skb);
 		return 0;
@@ -3863,7 +3863,7 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 		} else {
 			err("%s: %s: no support for non-SNAP 802.2 packets "
 			    "(DSAP x%02x SSAP x%02x cntrl x%02x)",
-			    dev->netdev->name, __FUNCTION__,
+			    priv->netdev->name, __FUNCTION__,
 			    skb->data[2 * ETH_ALEN + 2],
 			    skb->data[2 * ETH_ALEN + 2 + 1],
 			    skb->data[2 * ETH_ALEN + 2 + 2]);
@@ -3882,16 +3882,16 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 	/* make wireless header */
 	i802_11_hdr->frame_ctl =
 	    cpu_to_le16(IEEE80211_FTYPE_DATA |
-			(dev->wep_enabled ? IEEE80211_FCTL_PROTECTED : 0) |
-			(dev->iw_mode ==
+			(priv->wep_enabled ? IEEE80211_FCTL_PROTECTED : 0) |
+			(priv->iw_mode ==
 			 IW_MODE_INFRA ? IEEE80211_FCTL_TODS : 0));
 
-	if (dev->iw_mode == IW_MODE_ADHOC) {
+	if (priv->iw_mode == IW_MODE_ADHOC) {
 		memcpy(i802_11_hdr->addr1, skb->data, ETH_ALEN);	/* destination */
 		memcpy(i802_11_hdr->addr2, skb->data + ETH_ALEN, ETH_ALEN);	/* source */
-		memcpy(i802_11_hdr->addr3, dev->bssid, ETH_ALEN);
-	} else if (dev->iw_mode == IW_MODE_INFRA) {
-		memcpy(i802_11_hdr->addr1, dev->bssid, ETH_ALEN);
+		memcpy(i802_11_hdr->addr3, priv->bssid, ETH_ALEN);
+	} else if (priv->iw_mode == IW_MODE_INFRA) {
+		memcpy(i802_11_hdr->addr1, priv->bssid, ETH_ALEN);
 		memcpy(i802_11_hdr->addr2, skb->data + ETH_ALEN, ETH_ALEN);	/* source */
 		memcpy(i802_11_hdr->addr3, skb->data, ETH_ALEN);	/* destination */
 	}
@@ -3901,7 +3901,7 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 
 	/* setup 'Atmel' header */
 	tx_buffer->wlength = cpu_to_le16(wlen);
-	tx_buffer->tx_rate = dev->txrate;
+	tx_buffer->tx_rate = priv->txrate;
 	/* for broadcast destination addresses, the firmware 0.100.x
 	   seems to choose the highest rate set with CMD_STARTUP in
 	   basic_rate_set replacing this value */
@@ -3912,38 +3912,38 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 	submit_len = wlen + AT76_TX_HDRLEN + tx_buffer->padding;
 
 	{
-		at76_dbg(DBG_TX_DATA_CONTENT, "%s skb->data %s", dev->netdev->name,
-		         hex2str(dev->obuf, skb->data,
-			    min((int)(sizeof(dev->obuf) - 1) / 2, 32), '\0'));
+		at76_dbg(DBG_TX_DATA_CONTENT, "%s skb->data %s", priv->netdev->name,
+		         hex2str(priv->obuf, skb->data,
+			    min((int)(sizeof(priv->obuf) - 1) / 2, 32), '\0'));
 		at76_dbg(DBG_TX_DATA, "%s tx  wlen x%x pad x%x rate %d hdr %s",
-		         dev->netdev->name,
+		         priv->netdev->name,
 		         le16_to_cpu(tx_buffer->wlength),
 		         tx_buffer->padding, tx_buffer->tx_rate,
-		         hex2str(dev->obuf, i802_11_hdr,
-			    min((sizeof(dev->obuf) - 1) / 2,
+		         hex2str(priv->obuf, i802_11_hdr,
+			    min((sizeof(priv->obuf) - 1) / 2,
 				sizeof(struct ieee80211_hdr_3addr)), '\0'));
-		at76_dbg(DBG_TX_DATA_CONTENT, "%s payload %s", dev->netdev->name,
-		         hex2str(dev->obuf, payload,
-			    min((int)(sizeof(dev->obuf) - 1) / 2, 48), '\0'));
+		at76_dbg(DBG_TX_DATA_CONTENT, "%s payload %s", priv->netdev->name,
+		         hex2str(priv->obuf, payload,
+			    min((int)(sizeof(priv->obuf) - 1) / 2, 48), '\0'));
 	}
 
 	/* send stuff */
 	netif_stop_queue(netdev);
 	netdev->trans_start = jiffies;
 
-	usb_fill_bulk_urb(dev->write_urb, dev->udev,
-		         usb_sndbulkpipe(dev->udev, dev->bulk_out_endpointAddr),
+	usb_fill_bulk_urb(priv->write_urb, priv->udev,
+		         usb_sndbulkpipe(priv->udev, priv->bulk_out_endpointAddr),
 		         tx_buffer, submit_len,
-		         at76_write_bulk_callback, dev);
-	ret = usb_submit_urb(dev->write_urb, GFP_ATOMIC);
+		         at76_write_bulk_callback, priv);
+	ret = usb_submit_urb(priv->write_urb, GFP_ATOMIC);
 	if (ret) {
 		stats->tx_errors++;
 		err("%s: error in tx submit urb: %d", netdev->name, ret);
 		if (ret == -EINVAL)
 			err("-EINVAL: urb %p urb->hcpriv %p urb->complete %p",
-			    dev->write_urb,
-			    dev->write_urb ? dev->write_urb->hcpriv : (void *)-1,
-			    dev->write_urb ? dev->write_urb->complete : (void *)-1);
+			    priv->write_urb,
+			    priv->write_urb ? priv->write_urb->hcpriv : (void *)-1,
+			    priv->write_urb ? priv->write_urb->complete : (void *)-1);
 		goto err;
 	}
 
@@ -3959,51 +3959,51 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 
 static void at76_tx_timeout(struct net_device *netdev)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
-	if (!dev)
+	if (!priv)
 		return;
 	warn("%s: tx timeout.", netdev->name);
 
-	usb_unlink_urb(dev->write_urb);
-	dev->stats.tx_errors++;
+	usb_unlink_urb(priv->write_urb);
+	priv->stats.tx_errors++;
 }
 
 
-static int at76_submit_rx_urb(struct at76_priv *dev)
+static int at76_submit_rx_urb(struct at76_priv *priv)
 {
 	int ret, size;
-	struct sk_buff *skb = dev->rx_skb;
+	struct sk_buff *skb = priv->rx_skb;
 
-	if (dev->read_urb == NULL) {
-		err("%s: dev->read_urb is NULL", __FUNCTION__);
+	if (priv->read_urb == NULL) {
+		err("%s: priv->read_urb is NULL", __FUNCTION__);
 		return -EFAULT;
 	}
 
 	if (skb == NULL) {
 		skb = dev_alloc_skb(sizeof(struct at76_rx_buffer));
 		if (skb == NULL) {
-			err("%s: unable to allocate rx skbuff.", dev->netdev->name);
+			err("%s: unable to allocate rx skbuff.", priv->netdev->name);
 			ret = -ENOMEM;
 			goto exit;
 		}
-		dev->rx_skb = skb;
+		priv->rx_skb = skb;
 	} else {
 		skb_push(skb, skb_headroom(skb));
 		skb_trim(skb, 0);
 	}
 
 	size = skb_tailroom(skb);
-	usb_fill_bulk_urb(dev->read_urb, dev->udev,
-		         usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr),
+	usb_fill_bulk_urb(priv->read_urb, priv->udev,
+		         usb_rcvbulkpipe(priv->udev, priv->bulk_in_endpointAddr),
 		         skb_put(skb, size), size,
-		         at76_read_bulk_callback, dev);
-	ret = usb_submit_urb(dev->read_urb, GFP_ATOMIC);
+		         at76_read_bulk_callback, priv);
+	ret = usb_submit_urb(priv->read_urb, GFP_ATOMIC);
 	if (ret < 0) {
 		if (ret == -ENODEV)
 			at76_dbg(DBG_DEVSTART, "usb_submit_urb returned -ENODEV");
 		else
-			err("%s: rx, usb_submit_urb failed: %d", dev->netdev->name, ret);
+			err("%s: rx, usb_submit_urb failed: %d", priv->netdev->name, ret);
 	}
 
 exit:
@@ -4011,103 +4011,103 @@ exit:
 		if (ret != -ENODEV) {
 			/* If we can't submit the URB, the adapter becomes completely
 			 * useless, so try again later */
-			if (--dev->nr_submit_rx_tries > 0)
-				schedule_work(&dev->work_submit_rx);
+			if (--priv->nr_submit_rx_tries > 0)
+				schedule_work(&priv->work_submit_rx);
 			else {
 				err("%s: giving up to submit rx urb after %d failures -"
 			    	    " please unload the driver and/or power cycle the device",
-			    	    dev->netdev->name, NR_SUBMIT_RX_TRIES);
+			    	    priv->netdev->name, NR_SUBMIT_RX_TRIES);
 			}
 		}
 	} else
 		/* reset counter to initial value */
-		dev->nr_submit_rx_tries = NR_SUBMIT_RX_TRIES;
+		priv->nr_submit_rx_tries = NR_SUBMIT_RX_TRIES;
 	return ret;
 }
 
 
 static int at76_open(struct net_device *netdev)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	int ret = 0;
 
 	at76_dbg(DBG_PROC_ENTRY, "at76_open entry");
 
-	if (down_interruptible(&dev->sem))
+	if (down_interruptible(&priv->sem))
 		return -EINTR;
 
-	/* if netdev->dev_addr != dev->mac_addr we must
+	/* if netdev->dev_addr != priv->mac_addr we must
 	   set the mac address in the device ! */
-	if (compare_ether_addr(netdev->dev_addr, dev->mac_addr)) {
-		if (at76_add_mac_address(dev, netdev->dev_addr) >= 0)
+	if (compare_ether_addr(netdev->dev_addr, priv->mac_addr)) {
+		if (at76_add_mac_address(priv, netdev->dev_addr) >= 0)
 			at76_dbg(DBG_PROGRESS, "%s: set new MAC addr %s",
 			         netdev->name, mac2str(netdev->dev_addr));
 	}
 #ifdef DEBUG
-	at76_dump_mib_mac_addr(dev);
+	at76_dump_mib_mac_addr(priv);
 #endif
 
-	dev->scan_state = SCAN_IDLE;
-	dev->last_scan = jiffies;
-	dev->nr_submit_rx_tries = NR_SUBMIT_RX_TRIES;	/* init counter */
+	priv->scan_state = SCAN_IDLE;
+	priv->last_scan = jiffies;
+	priv->nr_submit_rx_tries = NR_SUBMIT_RX_TRIES;	/* init counter */
 
-	if ((ret = at76_submit_rx_urb(dev)) < 0) {
+	if ((ret = at76_submit_rx_urb(priv)) < 0) {
 		err("%s: open: submit_rx_urb failed: %d", netdev->name, ret);
 		goto err;
 	}
 
-	dev->open_count++;
+	priv->open_count++;
 
-	schedule_work(&dev->work_restart);
+	schedule_work(&priv->work_restart);
 
 	at76_dbg(DBG_PROC_ENTRY, "at76_open end");
  err:
-	up(&dev->sem);
+	up(&priv->sem);
 	return ret < 0 ? ret : 0;
 }
 
 
 static int at76_stop(struct net_device *netdev)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 	unsigned long flags;
 
 	at76_dbg(DBG_DEVSTART, "%s: ENTER", __FUNCTION__);
 
-	if (down_interruptible(&dev->sem))
+	if (down_interruptible(&priv->sem))
 		return -EINTR;
 
 	netif_stop_queue(netdev);
 
-	dev->istate = INIT;
+	priv->istate = INIT;
 
-	if (!(dev->device_unplugged)) {
+	if (!(priv->device_unplugged)) {
 		/* we are called by "ifconfig ethX down", not because the
 		   device isn't avail. anymore */
-		at76_set_radio(dev, 0);
+		at76_set_radio(priv, 0);
 
 		/* we unlink the read urb, because the _open()
 		   submits it again. _delete_device() takes care of the
 		   read_urb otherwise. */
-		usb_kill_urb(dev->read_urb);
+		usb_kill_urb(priv->read_urb);
 	}
 
-	del_timer_sync(&dev->mgmt_timer);
+	del_timer_sync(&priv->mgmt_timer);
 
-	spin_lock_irqsave(&dev->mgmt_spinlock, flags);
-	if (dev->next_mgmt_bulk) {
-		kfree(dev->next_mgmt_bulk);
-		dev->next_mgmt_bulk = NULL;
+	spin_lock_irqsave(&priv->mgmt_spinlock, flags);
+	if (priv->next_mgmt_bulk) {
+		kfree(priv->next_mgmt_bulk);
+		priv->next_mgmt_bulk = NULL;
 	}
-	spin_unlock_irqrestore(&dev->mgmt_spinlock, flags);
+	spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
 
 	/* free the bss_list */
-	at76_free_bss_list(dev);
+	at76_free_bss_list(priv);
 
-	at76_assert(dev->open_count > 0);
-	dev->open_count--;
+	at76_assert(priv->open_count > 0);
+	priv->open_count--;
 
-	up(&dev->sem);
+	up(&priv->sem);
 	at76_dbg(DBG_DEVSTART, "%s: EXIT", __FUNCTION__);
 
 	return 0;
@@ -4117,7 +4117,7 @@ static int at76_stop(struct net_device *netdev)
 static void at76_ethtool_get_drvinfo(struct net_device *netdev,
 					 struct ethtool_drvinfo *info)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
+	struct at76_priv *priv = netdev_priv(netdev);
 
 	strncpy(info->driver, DRIVER_NAME, sizeof(info->driver) - 1);
 
@@ -4125,19 +4125,19 @@ static void at76_ethtool_get_drvinfo(struct net_device *netdev,
 	info->version[sizeof(info->version) - 1] = '\0';
 
 	snprintf(info->bus_info, sizeof(info->bus_info) - 1, "usb%d:%d",
-		 dev->udev->bus->busnum, dev->udev->devnum);
+		 priv->udev->bus->busnum, priv->udev->devnum);
 
 	snprintf(info->fw_version, sizeof(info->fw_version) - 1,
 		 "%d.%d.%d-%d",
-		 dev->fw_version.major, dev->fw_version.minor,
-		 dev->fw_version.patch, dev->fw_version.build);
+		 priv->fw_version.major, priv->fw_version.minor,
+		 priv->fw_version.patch, priv->fw_version.build);
 }
 
 
 static u32 at76_ethtool_get_link(struct net_device *netdev)
 {
-	struct at76_priv *dev = netdev_priv(netdev);
-	return dev->istate == CONNECTED;
+	struct at76_priv *priv = netdev_priv(netdev);
+	return priv->istate == CONNECTED;
 }
 
 
@@ -4154,29 +4154,29 @@ static struct ethtool_ops at76_ethtool_ops = {
  * because hotplug may try to configure the netdev _before_ (or parallel to)
  * the download of firmware
  */
-static int at76_init_new_device(struct at76_priv *dev)
+static int at76_init_new_device(struct at76_priv *priv)
 {
-	struct net_device *netdev = dev->netdev;
+	struct net_device *netdev = priv->netdev;
 	int ret;
 
 	/* set up the endpoint information */
 	/* check out the endpoints */
 
-	dev->interface = dev->udev->actconfig->interface[0];
+	priv->interface = priv->udev->actconfig->interface[0];
 
 	at76_dbg(DBG_DEVSTART, "USB interface: %d endpoints",
-	         dev->interface->cur_altsetting->desc.bNumEndpoints);
+	         priv->interface->cur_altsetting->desc.bNumEndpoints);
 
-	if ((ret = at76_alloc_urbs(dev)) < 0)
+	if ((ret = at76_alloc_urbs(priv)) < 0)
 		goto error;
 
 	/* get firmware version */
-	ret = at76_get_mib(dev->udev, MIB_FW_VERSION, &dev->fw_version,
-			   sizeof(dev->fw_version));
-	if ((ret < 0) || ((dev->fw_version.major == 0) &&
-			  (dev->fw_version.minor == 0) &&
-			  (dev->fw_version.patch == 0) &&
-			  (dev->fw_version.build == 0))) {
+	ret = at76_get_mib(priv->udev, MIB_FW_VERSION, &priv->fw_version,
+			   sizeof(priv->fw_version));
+	if ((ret < 0) || ((priv->fw_version.major == 0) &&
+			  (priv->fw_version.minor == 0) &&
+			  (priv->fw_version.patch == 0) &&
+			  (priv->fw_version.build == 0))) {
 		err("getting firmware failed with %d, or version is 0", ret);
 		err("this probably means that the ext. fw was not loaded correctly");
 		if(ret >= 0)
@@ -4185,47 +4185,47 @@ static int at76_init_new_device(struct at76_priv *dev)
 	}
 
 	/* fw 0.84 doesn't send FCS with rx data */
-	if (dev->fw_version.major == 0 && dev->fw_version.minor <= 84)
-		dev->rx_data_fcs_len = 0;
+	if (priv->fw_version.major == 0 && priv->fw_version.minor <= 84)
+		priv->rx_data_fcs_len = 0;
 	else
-		dev->rx_data_fcs_len = 4;
+		priv->rx_data_fcs_len = 4;
 
 	info("firmware version %d.%d.%d #%d (fcs_len %d)",
-	     dev->fw_version.major, dev->fw_version.minor,
-	     dev->fw_version.patch, dev->fw_version.build,
-	     dev->rx_data_fcs_len);
+	     priv->fw_version.major, priv->fw_version.minor,
+	     priv->fw_version.patch, priv->fw_version.build,
+	     priv->rx_data_fcs_len);
 
 	/* MAC address */
-	ret = at76_get_hw_config(dev);
+	ret = at76_get_hw_config(priv);
 	if (ret < 0) {
 		err("could not get MAC address");
 		goto error;
 	}
 
-	dev->domain = at76_get_reg_domain(dev->regulatory_domain);
+	priv->domain = at76_get_reg_domain(priv->regulatory_domain);
 	/* init. netdev->dev_addr */
-	memcpy(netdev->dev_addr, dev->mac_addr, ETH_ALEN);
+	memcpy(netdev->dev_addr, priv->mac_addr, ETH_ALEN);
 	info("device's MAC %s, regulatory domain %s (id %d)",
-	     mac2str(dev->mac_addr), dev->domain->name, dev->regulatory_domain);
+	     mac2str(priv->mac_addr), priv->domain->name, priv->regulatory_domain);
 
 	/* initializing */
-	dev->international_roaming = international_roaming;
-	dev->channel = DEF_CHANNEL;
-	dev->iw_mode = default_iw_mode;
-	memset(dev->essid, 0, IW_ESSID_MAX_SIZE);
-	dev->rts_threshold = DEF_RTS_THRESHOLD;
-	dev->frag_threshold = DEF_FRAG_THRESHOLD;
-	dev->short_retry_limit = DEF_SHORT_RETRY_LIMIT;
-	dev->txrate = TX_RATE_AUTO;
-	dev->preamble_type = preamble_type;
-	dev->beacon_period = 100;
-	dev->beacons_last_qual = jiffies_to_msecs(jiffies);
-	dev->auth_mode = auth_mode ? WLAN_AUTH_SHARED_KEY : WLAN_AUTH_OPEN;
-	dev->scan_min_time = scan_min_time;
-	dev->scan_max_time = scan_max_time;
-	dev->scan_mode = scan_mode;
-	dev->monitor_scan_min_time = monitor_scan_min_time;
-	dev->monitor_scan_max_time = monitor_scan_max_time;
+	priv->international_roaming = international_roaming;
+	priv->channel = DEF_CHANNEL;
+	priv->iw_mode = default_iw_mode;
+	memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
+	priv->rts_threshold = DEF_RTS_THRESHOLD;
+	priv->frag_threshold = DEF_FRAG_THRESHOLD;
+	priv->short_retry_limit = DEF_SHORT_RETRY_LIMIT;
+	priv->txrate = TX_RATE_AUTO;
+	priv->preamble_type = preamble_type;
+	priv->beacon_period = 100;
+	priv->beacons_last_qual = jiffies_to_msecs(jiffies);
+	priv->auth_mode = auth_mode ? WLAN_AUTH_SHARED_KEY : WLAN_AUTH_OPEN;
+	priv->scan_min_time = scan_min_time;
+	priv->scan_max_time = scan_max_time;
+	priv->scan_mode = scan_mode;
+	priv->monitor_scan_min_time = monitor_scan_min_time;
+	priv->monitor_scan_max_time = monitor_scan_max_time;
 
 	netdev->flags &= ~IFF_MULTICAST; /* not yet or never */
 	netdev->open = at76_open;
@@ -4234,8 +4234,8 @@ static int at76_init_new_device(struct at76_priv *dev)
 	netdev->ethtool_ops = &at76_ethtool_ops;
 
 	/* Add pointers to enable iwspy support. */
-	dev->wireless_data.spy_data = &dev->spy_data;
-	netdev->wireless_data = &dev->wireless_data;
+	priv->wireless_data.spy_data = &priv->spy_data;
+	netdev->wireless_data = &priv->wireless_data;
 
 	netdev->hard_start_xmit = at76_tx;
 	netdev->tx_timeout = at76_tx_timeout;
@@ -4244,21 +4244,21 @@ static int at76_init_new_device(struct at76_priv *dev)
 	netdev->set_multicast_list = at76_set_multicast;
 	netdev->set_mac_address = at76_set_mac_address;
 
-	ret = register_netdev(dev->netdev);
+	ret = register_netdev(priv->netdev);
 	if (ret) {
 		err("unable to register netdevice %s (status %d)!",
-		    dev->netdev->name, ret);
+		    priv->netdev->name, ret);
 		goto error;
 	}
-	info("registered %s", dev->netdev->name);
-	dev->netdev_registered = 1;
+	info("registered %s", priv->netdev->name);
+	priv->netdev_registered = 1;
 
 	/* we let this timer run the whole time this driver instance lives */
-	mod_timer(&dev->bss_list_timer, jiffies + BSS_LIST_TIMEOUT);
+	mod_timer(&priv->bss_list_timer, jiffies + BSS_LIST_TIMEOUT);
 
 	return 0;
  error:
-	at76_delete_device(dev);
+	at76_delete_device(priv);
 	return ret;
 }
 
@@ -4266,14 +4266,14 @@ static int at76_init_new_device(struct at76_priv *dev)
 /* Download external firmware */
 static void at76_work_external_fw(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_external_fw);
 	int ret;
 	u8 op_mode;
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	op_mode = at76_get_op_mode(dev->udev);
+	op_mode = at76_get_op_mode(priv->udev);
 	at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);
 
 	if (op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
@@ -4281,41 +4281,41 @@ static void at76_work_external_fw(struct work_struct *work)
 		goto end_external_fw;
 	}
 
-	if (dev->extfw && dev->extfw_size) {
-		ret = at76_download_external_fw(dev->udev, dev->extfw,
-					        dev->extfw_size);
+	if (priv->extfw && priv->extfw_size) {
+		ret = at76_download_external_fw(priv->udev, priv->extfw,
+					        priv->extfw_size);
 		if (ret < 0) {
 			err("Downloading external firmware failed: %d", ret);
 			goto end_external_fw;
 		}
-		if (dev->board_type == BOARDTYPE_505A_RFMD_2958) {
+		if (priv->board_type == BOARDTYPE_505A_RFMD_2958) {
 			info("200 ms delay for board type 7");
-			/* can we do this with dev->sem down? */
+			/* can we do this with priv->sem down? */
 			set_current_state(TASK_INTERRUPTIBLE);
 			schedule_timeout(HZ / 5 + 1);
 		}
 	}
-	dev->istate = INIT;
-	if ((ret = at76_init_new_device(dev)) < 0)
+	priv->istate = INIT;
+	if ((ret = at76_init_new_device(priv)) < 0)
 		err("Downloading external firmware failed: %d", ret);
 
   end_external_fw:
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
 /* Download internal firmware */
 static void at76_work_internal_fw(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_internal_fw);
 	int ret;
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	ret = at76_usbdfu_download(dev->udev, dev->intfw,
-			           dev->intfw_size,
-			           dev->board_type ==
+	ret = at76_usbdfu_download(priv->udev, priv->intfw,
+			           priv->intfw_size,
+			           priv->board_type ==
 			           BOARDTYPE_505A_RFMD_2958 ? 2000 : 0);
 
 	if (ret < 0) {
@@ -4326,51 +4326,51 @@ static void at76_work_internal_fw(struct work_struct *work)
 	at76_dbg(DBG_DEVSTART, "sending REMAP");
 
 	/* no REMAP for 505A (see SF driver) */
-	if (dev->board_type != BOARDTYPE_505A_RFMD_2958)
-		if ((ret = at76_remap(dev->udev)) < 0) {
+	if (priv->board_type != BOARDTYPE_505A_RFMD_2958)
+		if ((ret = at76_remap(priv->udev)) < 0) {
 			err("sending REMAP failed with %d", ret);
 			goto end_internal_fw;
 		}
 
 	at76_dbg(DBG_DEVSTART, "sleeping for 2 seconds");
-	dev->istate = EXTFW_DOWNLOAD;
-	mod_timer(&dev->fw_dl_timer, jiffies + 2 * HZ + 1);
+	priv->istate = EXTFW_DOWNLOAD;
+	mod_timer(&priv->fw_dl_timer, jiffies + 2 * HZ + 1);
 
   end_internal_fw:
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
-static int at76_essid_matched(struct at76_priv *dev, struct bss_info *ptr)
+static int at76_essid_matched(struct at76_priv *priv, struct bss_info *ptr)
 {
 	/* common criteria for both modi */
 
-	int ret = (dev->essid_size == 0 /* ANY ssid */  ||
-		      (dev->essid_size == ptr->ssid_len &&
-		       !memcmp(dev->essid, ptr->ssid, ptr->ssid_len)));
+	int ret = (priv->essid_size == 0 /* ANY ssid */  ||
+		      (priv->essid_size == ptr->ssid_len &&
+		       !memcmp(priv->essid, ptr->ssid, ptr->ssid_len)));
 	if (!ret)
 		at76_dbg(DBG_BSS_MATCH, "%s bss table entry %p: essid didn't match",
-		         dev->netdev->name, ptr);
+		         priv->netdev->name, ptr);
 	return ret;
 }
 
 
-static inline int at76_mode_matched(struct at76_priv *dev, struct bss_info *ptr)
+static inline int at76_mode_matched(struct at76_priv *priv, struct bss_info *ptr)
 {
 	int ret;
 
-	if (dev->iw_mode == IW_MODE_ADHOC)
+	if (priv->iw_mode == IW_MODE_ADHOC)
 		ret = ptr->capa & WLAN_CAPABILITY_IBSS;
 	else
 		ret = ptr->capa & WLAN_CAPABILITY_ESS;
 	if (!ret)
 		at76_dbg(DBG_BSS_MATCH, "%s bss table entry %p: mode didn't match",
-		         dev->netdev->name, ptr);
+		         priv->netdev->name, ptr);
 	return ret;
 }
 
 
-static int at76_rates_matched(struct at76_priv *dev, struct bss_info *ptr)
+static int at76_rates_matched(struct at76_priv *priv, struct bss_info *ptr)
 {
 	int i;
 	u8 *rate;
@@ -4385,27 +4385,27 @@ static int at76_rates_matched(struct at76_priv *dev, struct bss_info *ptr)
 			    && *rate != (0x80 | hw_rates[3])) {
 				at76_dbg(DBG_BSS_MATCH,
 				         "%s: bss table entry %p: basic rate %02x not supported",
-				         dev->netdev->name, ptr, *rate);
+				         priv->netdev->name, ptr, *rate);
 				return 0;
 			}
 		}
 	/* if we use short preamble, the bss must support it */
-	if (dev->preamble_type == PREAMBLE_TYPE_SHORT &&
+	if (priv->preamble_type == PREAMBLE_TYPE_SHORT &&
 	    !(ptr->capa & WLAN_CAPABILITY_SHORT_PREAMBLE)) {
 		at76_dbg(DBG_BSS_MATCH, "%s: %p does not support short preamble",
-		         dev->netdev->name, ptr);
+		         priv->netdev->name, ptr);
 		return 0;
 	} else
 		return 1;
 }
 
 
-static inline int at76_wep_matched(struct at76_priv *dev, struct bss_info *ptr)
+static inline int at76_wep_matched(struct at76_priv *priv, struct bss_info *ptr)
 {
-	if (!dev->wep_enabled && ptr->capa & WLAN_CAPABILITY_PRIVACY) {
+	if (!priv->wep_enabled && ptr->capa & WLAN_CAPABILITY_PRIVACY) {
 		/* we have disabled WEP, but the BSS signals privacy */
 		at76_dbg(DBG_BSS_MATCH, "%s: bss table entry %p: requires encryption",
-		         dev->netdev->name, ptr);
+		         priv->netdev->name, ptr);
 		return 0;
 	}
 	/* otherwise if the BSS does not signal privacy it may well
@@ -4414,15 +4414,15 @@ static inline int at76_wep_matched(struct at76_priv *dev, struct bss_info *ptr)
 }
 
 
-static inline int at76_bssid_matched(struct at76_priv *dev,
+static inline int at76_bssid_matched(struct at76_priv *priv,
 				     struct bss_info *ptr)
 {
-	if (!dev->wanted_bssid_valid ||
-	    !compare_ether_addr(ptr->bssid, dev->wanted_bssid)) {
+	if (!priv->wanted_bssid_valid ||
+	    !compare_ether_addr(ptr->bssid, priv->wanted_bssid)) {
 		return 1;
 	} else {
 		at76_dbg(DBG_BSS_MATCH, "%s: requested bssid - %s does not match",
-			 dev->netdev->name, mac2str(dev->wanted_bssid));
+			 priv->netdev->name, mac2str(priv->wanted_bssid));
 		at76_dbg(DBG_BSS_MATCH, "      AP bssid - %s of bss table entry %p",
 			 mac2str(ptr->bssid), ptr);
 		return 0;
@@ -4431,37 +4431,37 @@ static inline int at76_bssid_matched(struct at76_priv *dev,
 
 
 /**
- * at76_match_bss - try to find a matching bss in dev->bss
+ * at76_match_bss - try to find a matching bss in priv->bss
  *
  * last - last bss tried
  *
- * last == NULL signals a new round starting with dev->bss_list.next
- * this function must be called inside an acquired dev->bss_list_spinlock
+ * last == NULL signals a new round starting with priv->bss_list.next
+ * this function must be called inside an acquired priv->bss_list_spinlock
  * otherwise the timeout on bss may remove the newly chosen entry
  */
-static struct bss_info *at76_match_bss(struct at76_priv *dev,
+static struct bss_info *at76_match_bss(struct at76_priv *priv,
 				       struct bss_info *last)
 {
 	struct bss_info *ptr = NULL;
 	struct list_head *curr;
 
-	curr = last != NULL ? last->list.next : dev->bss_list.next;
-	while (curr != &dev->bss_list) {
+	curr = last != NULL ? last->list.next : priv->bss_list.next;
+	while (curr != &priv->bss_list) {
 		ptr = list_entry(curr, struct bss_info, list);
-		if (at76_essid_matched(dev, ptr) &&
-		    at76_mode_matched(dev, ptr) &&
-		    at76_wep_matched(dev, ptr) &&
-		    at76_rates_matched(dev, ptr) &&
-		    at76_bssid_matched(dev, ptr))
+		if (at76_essid_matched(priv, ptr) &&
+		    at76_mode_matched(priv, ptr) &&
+		    at76_wep_matched(priv, ptr) &&
+		    at76_rates_matched(priv, ptr) &&
+		    at76_bssid_matched(priv, ptr))
 			break;
 		curr = curr->next;
 	}
 
-	if (curr == &dev->bss_list)
+	if (curr == &priv->bss_list)
 		ptr = NULL;
 	/* otherwise ptr points to the struct bss_info we have chosen */
 
-	at76_dbg(DBG_BSS_TABLE, "%s %s: returned %p", dev->netdev->name,
+	at76_dbg(DBG_BSS_TABLE, "%s %s: returned %p", priv->netdev->name,
 	         __FUNCTION__, ptr);
 	return ptr;
 }
@@ -4470,109 +4470,109 @@ static struct bss_info *at76_match_bss(struct at76_priv *dev,
 /* Try joining a BSS */
 static void at76_work_join(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_join);
 	int ret;
 	unsigned long flags;
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	if (dev->istate == INIT)
+	if (priv->istate == INIT)
 		goto end_join;
 
-	at76_assert(dev->istate == JOINING);
-	/* dev->curr_bss == NULL signals a new round,
-	   starting with list_entry(dev->bss_list.next, ...) */
+	at76_assert(priv->istate == JOINING);
+	/* priv->curr_bss == NULL signals a new round,
+	   starting with list_entry(priv->bss_list.next, ...) */
 
-	/* secure the access to dev->curr_bss ! */
-	spin_lock_irqsave(&dev->bss_list_spinlock, flags);
-	dev->curr_bss = at76_match_bss(dev, dev->curr_bss);
-	spin_unlock_irqrestore(&dev->bss_list_spinlock, flags);
+	/* secure the access to priv->curr_bss ! */
+	spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+	priv->curr_bss = at76_match_bss(priv, priv->curr_bss);
+	spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
 
-	if (dev->curr_bss != NULL) {
-		if ((ret = at76_join_bss(dev, dev->curr_bss)) < 0) {
+	if (priv->curr_bss != NULL) {
+		if ((ret = at76_join_bss(priv, priv->curr_bss)) < 0) {
 			err("%s: join_bss failed with %d",
-			    dev->netdev->name, ret);
+			    priv->netdev->name, ret);
 			goto end_join;
 		}
 
-		ret = at76_wait_completion(dev, CMD_JOIN);
+		ret = at76_wait_completion(priv, CMD_JOIN);
 		if (ret != CMD_STATUS_COMPLETE) {
 			if (ret != CMD_STATUS_TIME_OUT)
 				err("%s join_bss completed with %d",
-				    dev->netdev->name, ret);
+				    priv->netdev->name, ret);
 			else
 				info("%s join_bss ssid %s timed out",
-				     dev->netdev->name,
-				     mac2str(dev->curr_bss->bssid));
+				     priv->netdev->name,
+				     mac2str(priv->curr_bss->bssid));
 
 			/* retry next BSS immediately */
-			schedule_work(&dev->work_join);
+			schedule_work(&priv->work_join);
 			goto end_join;
 		}
 
 		/* here we have joined the (I)BSS */
-		if (dev->iw_mode == IW_MODE_ADHOC) {
-			struct bss_info *bptr = dev->curr_bss;
-			dev->istate = CONNECTED;
-			/* get ESSID, BSSID and channel for dev->curr_bss */
-			dev->essid_size = bptr->ssid_len;
-			memcpy(dev->essid, bptr->ssid, bptr->ssid_len);
-			memcpy(dev->bssid, bptr->bssid, ETH_ALEN);
-			dev->channel = bptr->channel;
-			at76_iwevent_bss_connect(dev->netdev, bptr->bssid);
-			netif_carrier_on(dev->netdev);
-			netif_start_queue(dev->netdev);
+		if (priv->iw_mode == IW_MODE_ADHOC) {
+			struct bss_info *bptr = priv->curr_bss;
+			priv->istate = CONNECTED;
+			/* get ESSID, BSSID and channel for priv->curr_bss */
+			priv->essid_size = bptr->ssid_len;
+			memcpy(priv->essid, bptr->ssid, bptr->ssid_len);
+			memcpy(priv->bssid, bptr->bssid, ETH_ALEN);
+			priv->channel = bptr->channel;
+			at76_iwevent_bss_connect(priv->netdev, bptr->bssid);
+			netif_carrier_on(priv->netdev);
+			netif_start_queue(priv->netdev);
 			/* just to be sure */
-			del_timer_sync(&dev->mgmt_timer);
+			del_timer_sync(&priv->mgmt_timer);
 		} else {
 			/* send auth req */
-			dev->istate = AUTHENTICATING;
-			at76_auth_req(dev, dev->curr_bss, 1, NULL);
+			priv->istate = AUTHENTICATING;
+			at76_auth_req(priv, priv->curr_bss, 1, NULL);
 			at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
 			         __FUNCTION__, __LINE__);
-			mod_timer(&dev->mgmt_timer, jiffies + HZ);
+			mod_timer(&priv->mgmt_timer, jiffies + HZ);
 		}
 		goto end_join;
 	}
 
 	/* here we haven't found a matching (i)bss ... */
-	if (dev->iw_mode == IW_MODE_ADHOC) {
-		dev->istate = STARTIBSS;
-		schedule_work(&dev->work_start_ibss);
+	if (priv->iw_mode == IW_MODE_ADHOC) {
+		priv->istate = STARTIBSS;
+		schedule_work(&priv->work_start_ibss);
 		goto end_join;
 	}
 	/* haven't found a matching BSS in infra mode - try again */
-	dev->istate = SCANNING;
-	schedule_work(&dev->work_scan);
+	priv->istate = SCANNING;
+	schedule_work(&priv->work_scan);
 
   end_join:
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
 static void at76_work_mgmt_timeout(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_mgmt_timeout);
 
-	down(&dev->sem);
-	at76_handle_mgmt_timeout(dev);
-	up(&dev->sem);
+	down(&priv->sem);
+	at76_handle_mgmt_timeout(priv);
+	up(&priv->sem);
 }
 
 
 static void at76_work_new_bss(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_new_bss);
 	int ret;
-	struct net_device *netdev = dev->netdev;
+	struct net_device *netdev = priv->netdev;
 	struct mib_mac_mgmt mac_mgmt;
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	ret = at76_get_mib(dev->udev, MIB_MAC_MGMT, &mac_mgmt,
+	ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, &mac_mgmt,
 		      sizeof(struct mib_mac_mgmt));
 	if (ret < 0) {
 		err("%s: at76_get_mib failed: %d", netdev->name, ret);
@@ -4580,87 +4580,87 @@ static void at76_work_new_bss(struct work_struct *work)
 	}
 
 	at76_dbg(DBG_PROGRESS, "ibss_change = 0x%2x", mac_mgmt.ibss_change);
-	memcpy(dev->bssid, mac_mgmt.current_bssid, ETH_ALEN);
-	at76_dbg(DBG_PROGRESS, "using BSSID %s", mac2str(dev->bssid));
+	memcpy(priv->bssid, mac_mgmt.current_bssid, ETH_ALEN);
+	at76_dbg(DBG_PROGRESS, "using BSSID %s", mac2str(priv->bssid));
 
-	at76_iwevent_bss_connect(dev->netdev, dev->bssid);
+	at76_iwevent_bss_connect(priv->netdev, priv->bssid);
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC_MGMT;
-	dev->mib_buf.size = 1;
-	dev->mib_buf.index = IBSS_CHANGE_OK_OFFSET;
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC_MGMT;
+	priv->mib_buf.size = 1;
+	priv->mib_buf.index = IBSS_CHANGE_OK_OFFSET;
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0)
 		err("%s: set_mib (ibss change ok) failed: %d", netdev->name, ret);
 
   new_bss_clean:
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
 static void at76_work_reset_device(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_reset_device);
 
-	down(&dev->sem);
-	usb_reset_device(dev->udev);
-	dev->istate = WAIT_FOR_DISCONNECT;
-	up(&dev->sem);
+	down(&priv->sem);
+	usb_reset_device(priv->udev);
+	priv->istate = WAIT_FOR_DISCONNECT;
+	up(&priv->sem);
 }
 
 
-static int at76_startup_device(struct at76_priv *dev)
+static int at76_startup_device(struct at76_priv *priv)
 {
-	struct at76_card_config *ccfg = &dev->card_config;
+	struct at76_card_config *ccfg = &priv->card_config;
 	int ret;
 
 	if (at76_debug & DBG_PARAMS) {
 		char ossid[IW_ESSID_MAX_SIZE + 1];
 
-		/* make dev->essid printable */
-		at76_assert(dev->essid_size <= IW_ESSID_MAX_SIZE);
-		memcpy(ossid, dev->essid, dev->essid_size);
-		ossid[dev->essid_size] = '\0';
+		/* make priv->essid printable */
+		at76_assert(priv->essid_size <= IW_ESSID_MAX_SIZE);
+		memcpy(ossid, priv->essid, priv->essid_size);
+		ossid[priv->essid_size] = '\0';
 
 		dbg("%s param: ssid %s (%s) mode %s ch %d wep %s key %d keylen %d",
-		       dev->netdev->name, ossid,
-		       hex2str(dev->obuf, dev->essid,
-			       min((int)(sizeof(dev->obuf)-1)/2,
+		       priv->netdev->name, ossid,
+		       hex2str(priv->obuf, priv->essid,
+			       min((int)(sizeof(priv->obuf)-1)/2,
 				   IW_ESSID_MAX_SIZE), '\0'),
-		       dev->iw_mode == IW_MODE_ADHOC ? "adhoc" : "infra",
-		       dev->channel,
-		       dev->wep_enabled ? "enabled" : "disabled",
-		       dev->wep_key_id, dev->wep_keys_len[dev->wep_key_id]);
+		       priv->iw_mode == IW_MODE_ADHOC ? "adhoc" : "infra",
+		       priv->channel,
+		       priv->wep_enabled ? "enabled" : "disabled",
+		       priv->wep_key_id, priv->wep_keys_len[priv->wep_key_id]);
 		dbg("%s param: preamble %s rts %d retry %d frag %d "
 		       "txrate %s auth_mode %d",
-		       dev->netdev->name,
-		       dev->preamble_type == PREAMBLE_TYPE_SHORT ? "short" : "long",
-		       dev->rts_threshold, dev->short_retry_limit,
-		       dev->frag_threshold,
-		       dev->txrate == TX_RATE_1MBIT ? "1MBit" :
-		       dev->txrate == TX_RATE_2MBIT ? "2MBit" :
-		       dev->txrate == TX_RATE_5_5MBIT ? "5.5MBit" :
-		       dev->txrate == TX_RATE_11MBIT ? "11MBit" :
-		       dev->txrate == TX_RATE_AUTO ? "auto" : "<invalid>",
-		       dev->auth_mode);
+		       priv->netdev->name,
+		       priv->preamble_type == PREAMBLE_TYPE_SHORT ? "short" : "long",
+		       priv->rts_threshold, priv->short_retry_limit,
+		       priv->frag_threshold,
+		       priv->txrate == TX_RATE_1MBIT ? "1MBit" :
+		       priv->txrate == TX_RATE_2MBIT ? "2MBit" :
+		       priv->txrate == TX_RATE_5_5MBIT ? "5.5MBit" :
+		       priv->txrate == TX_RATE_11MBIT ? "11MBit" :
+		       priv->txrate == TX_RATE_AUTO ? "auto" : "<invalid>",
+		       priv->auth_mode);
 		dbg("%s param: pm_mode %d pm_period %d auth_mode %s "
 		       "scan_times %d %d scan_mode %s international_roaming %d",
-		       dev->netdev->name,
-		       dev->pm_mode, dev->pm_period,
-		       dev->auth_mode == WLAN_AUTH_OPEN ?
+		       priv->netdev->name,
+		       priv->pm_mode, priv->pm_period,
+		       priv->auth_mode == WLAN_AUTH_OPEN ?
 		       "open" : "shared_secret",
-		       dev->scan_min_time, dev->scan_max_time,
-		       dev->scan_mode == SCAN_TYPE_ACTIVE ? "active" : "passive",
-		       dev->international_roaming);
+		       priv->scan_min_time, priv->scan_max_time,
+		       priv->scan_mode == SCAN_TYPE_ACTIVE ? "active" : "passive",
+		       priv->international_roaming);
 	}
 
 	memset(ccfg, 0, sizeof(struct at76_card_config));
 	ccfg->promiscuous_mode = 0;
-	ccfg->short_retry_limit = dev->short_retry_limit;
+	ccfg->short_retry_limit = priv->short_retry_limit;
 
-	if (dev->wep_enabled) {
-		if (dev->wep_keys_len[dev->wep_key_id] > WEP_SMALL_KEY_LEN)
+	if (priv->wep_enabled) {
+		if (priv->wep_keys_len[priv->wep_key_id] > WEP_SMALL_KEY_LEN)
 			ccfg->encryption_type = 2;
 		else
 			ccfg->encryption_type = 1;
@@ -4672,64 +4672,64 @@ static int at76_startup_device(struct at76_priv *dev)
 		ccfg->encryption_type = 0;
 	}
 
-	ccfg->rts_threshold = cpu_to_le16(dev->rts_threshold);
-	ccfg->fragmentation_threshold = cpu_to_le16(dev->frag_threshold);
+	ccfg->rts_threshold = cpu_to_le16(priv->rts_threshold);
+	ccfg->fragmentation_threshold = cpu_to_le16(priv->frag_threshold);
 
 	memcpy(ccfg->basic_rate_set, hw_rates, 4);
 	/* jal: really needed, we do a set_mib for autorate later ??? */
-	ccfg->auto_rate_fallback = (dev->txrate == TX_RATE_AUTO ? 1 : 0);
-	ccfg->channel = dev->channel;
-	ccfg->privacy_invoked = dev->wep_enabled;
-	memcpy(ccfg->current_ssid, dev->essid, IW_ESSID_MAX_SIZE);
-	ccfg->ssid_len = dev->essid_size;
+	ccfg->auto_rate_fallback = (priv->txrate == TX_RATE_AUTO ? 1 : 0);
+	ccfg->channel = priv->channel;
+	ccfg->privacy_invoked = priv->wep_enabled;
+	memcpy(ccfg->current_ssid, priv->essid, IW_ESSID_MAX_SIZE);
+	ccfg->ssid_len = priv->essid_size;
 
-	ccfg->wep_default_key_id = dev->wep_key_id;
-	memcpy(ccfg->wep_default_key_value, dev->wep_keys, 4 * WEP_KEY_LEN);
+	ccfg->wep_default_key_id = priv->wep_key_id;
+	memcpy(ccfg->wep_default_key_value, priv->wep_keys, 4 * WEP_KEY_LEN);
 
-	ccfg->short_preamble = dev->preamble_type;
-	ccfg->beacon_period = cpu_to_le16(dev->beacon_period);
+	ccfg->short_preamble = priv->preamble_type;
+	ccfg->beacon_period = cpu_to_le16(priv->beacon_period);
 
-	ret = at76_set_card_command(dev->udev, CMD_STARTUP, &dev->card_config,
+	ret = at76_set_card_command(priv->udev, CMD_STARTUP, &priv->card_config,
 			            sizeof(struct at76_card_config));
 	if (ret < 0) {
-		err("%s: at76_set_card_command failed: %d", dev->netdev->name, ret);
+		err("%s: at76_set_card_command failed: %d", priv->netdev->name, ret);
 		return ret;
 	}
 
-	at76_wait_completion(dev, CMD_STARTUP);
+	at76_wait_completion(priv, CMD_STARTUP);
 
 	/* remove BSSID from previous run */
-	memset(dev->bssid, 0, ETH_ALEN);
+	memset(priv->bssid, 0, ETH_ALEN);
 
-	if (at76_set_radio(dev, 1) == 1)
-		at76_wait_completion(dev, CMD_RADIO);
+	if (at76_set_radio(priv, 1) == 1)
+		at76_wait_completion(priv, CMD_RADIO);
 
-	if ((ret = at76_set_preamble(dev, dev->preamble_type)) < 0)
+	if ((ret = at76_set_preamble(priv, priv->preamble_type)) < 0)
 		return ret;
 
-	if ((ret = at76_set_frag(dev, dev->frag_threshold)) < 0)
+	if ((ret = at76_set_frag(priv, priv->frag_threshold)) < 0)
 		return ret;
 
-	if ((ret = at76_set_rts(dev, dev->rts_threshold)) < 0)
+	if ((ret = at76_set_rts(priv, priv->rts_threshold)) < 0)
 		return ret;
 
-	if ((ret = at76_set_autorate_fallback(dev, dev->txrate == TX_RATE_AUTO ? 1 : 0)) < 0)
+	if ((ret = at76_set_autorate_fallback(priv, priv->txrate == TX_RATE_AUTO ? 1 : 0)) < 0)
 		return ret;
 
-	if ((ret = at76_set_pm_mode(dev)) < 0)
+	if ((ret = at76_set_pm_mode(priv)) < 0)
 		return ret;
 
-	if ((ret = at76_set_iroaming(dev, dev->international_roaming)) < 0)
+	if ((ret = at76_set_iroaming(priv, priv->international_roaming)) < 0)
 		return ret;
 
 	if (at76_debug & DBG_MIB) {
-		at76_dump_mib_mac(dev);
-		at76_dump_mib_mac_addr(dev);
-		at76_dump_mib_mac_mgmt(dev);
-		at76_dump_mib_mac_wep(dev);
-		at76_dump_mib_mdomain(dev);
-		at76_dump_mib_phy(dev);
-		at76_dump_mib_local(dev);
+		at76_dump_mib_mac(priv);
+		at76_dump_mib_mac_addr(priv);
+		at76_dump_mib_mac_mgmt(priv);
+		at76_dump_mib_mac_wep(priv);
+		at76_dump_mib_mdomain(priv);
+		at76_dump_mib_phy(priv);
+		at76_dump_mib_local(priv);
 	}
 
 	return 0;
@@ -4737,164 +4737,164 @@ static int at76_startup_device(struct at76_priv *dev)
 
 
 /**
- * set_monitor_mode - sets dev->netdev->type
+ * set_monitor_mode - sets priv->netdev->type
  */
-static void at76_set_monitor_mode(struct at76_priv *dev)
+static void at76_set_monitor_mode(struct at76_priv *priv)
 {
-	if (dev->iw_mode == IW_MODE_MONITOR) {
+	if (priv->iw_mode == IW_MODE_MONITOR) {
 		at76_dbg(DBG_MONITOR_MODE, "%s: MONITOR MODE ON",
-			 dev->netdev->name);
-		dev->netdev->type = ARPHRD_IEEE80211_RADIOTAP;
+			 priv->netdev->name);
+		priv->netdev->type = ARPHRD_IEEE80211_RADIOTAP;
 	} else {
 		at76_dbg(DBG_MONITOR_MODE, "%s: MONITOR MODE OFF",
-		         dev->netdev->name);
-		dev->netdev->type = ARPHRD_ETHER;
+		         priv->netdev->name);
+		priv->netdev->type = ARPHRD_ETHER;
 	}
 }
 
 
 static void at76_work_restart(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_restart);
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	at76_startup_device(dev);
-	at76_set_monitor_mode(dev);
+	at76_startup_device(priv);
+	at76_set_monitor_mode(priv);
 
-	netif_carrier_off(dev->netdev);	/* disable running netdev watchdog */
-	netif_stop_queue(dev->netdev);	/* stop tx data packets */
-	if (dev->iw_mode != IW_MODE_MONITOR) {
-		dev->istate = SCANNING;
-		schedule_work(&dev->work_scan);
+	netif_carrier_off(priv->netdev);	/* disable running netdev watchdog */
+	netif_stop_queue(priv->netdev);	/* stop tx data packets */
+	if (priv->iw_mode != IW_MODE_MONITOR) {
+		priv->istate = SCANNING;
+		schedule_work(&priv->work_scan);
 	} else {
-		dev->istate = MONITORING;
-		at76_start_scan(dev, 0, 0);
+		priv->istate = MONITORING;
+		at76_start_scan(priv, 0, 0);
 		at76_dbg(DBG_MGMT_TIMER,
 		         "%s:%d: starting mgmt_timer for %d ticks",
 		         __FUNCTION__, __LINE__, SCAN_POLL_INTERVAL);
-		mod_timer(&dev->mgmt_timer,
+		mod_timer(&priv->mgmt_timer,
 			  jiffies + SCAN_POLL_INTERVAL);
 	}
 
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
 static void at76_work_scan(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_scan);
 	int ret;
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	at76_assert(dev->istate == SCANNING);
+	at76_assert(priv->istate == SCANNING);
 	/* only clear the bss list when a scan is actively initiated,
 	 * otherwise simply rely on at76_bss_list_timeout */
-	if (dev->scan_state == SCAN_IN_PROGRESS)
-		at76_free_bss_list(dev);
+	if (priv->scan_state == SCAN_IN_PROGRESS)
+		at76_free_bss_list(priv);
 
-	dev->scan_runs = 2;
-	if ((ret = at76_start_scan(dev, 0, 1)) < 0) {
+	priv->scan_runs = 2;
+	if ((ret = at76_start_scan(priv, 0, 1)) < 0) {
 		err("%s: %s: start_scan failed with %d",
-		    dev->netdev->name, __FUNCTION__, ret);
+		    priv->netdev->name, __FUNCTION__, ret);
 	} else {
 		at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer for %d ticks",
 		         __FUNCTION__, __LINE__, SCAN_POLL_INTERVAL);
-		mod_timer(&dev->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
+		mod_timer(&priv->mgmt_timer, jiffies + SCAN_POLL_INTERVAL);
 	}
 
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
 static void at76_work_set_promisc(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_set_promisc);
 	int ret = 0;
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_LOCAL;
-	dev->mib_buf.size = 1;
-	dev->mib_buf.index = offsetof(struct mib_local, promiscuous_mode);
-	dev->mib_buf.data[0] = dev->promisc ? 1 : 0;
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_LOCAL;
+	priv->mib_buf.size = 1;
+	priv->mib_buf.index = offsetof(struct mib_local, promiscuous_mode);
+	priv->mib_buf.data[0] = priv->promisc ? 1 : 0;
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
 		err("%s: set_mib (promiscuous_mode) failed: %d",
-		    dev->netdev->name, ret);
+		    priv->netdev->name, ret);
 	}
 
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
 static void at76_work_start_ibss(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_start_ibss);
 	int ret;
 
-	down(&dev->sem);
+	down(&priv->sem);
 
-	at76_assert(dev->istate == STARTIBSS);
-	ret = at76_start_ibss(dev);
+	at76_assert(priv->istate == STARTIBSS);
+	ret = at76_start_ibss(priv);
 	if (ret < 0) {
-		err("%s: start_ibss failed: %d", dev->netdev->name, ret);
+		err("%s: start_ibss failed: %d", priv->netdev->name, ret);
 		goto end_startibss;
 	}
 
-	ret = at76_wait_completion(dev, CMD_START_IBSS);
+	ret = at76_wait_completion(priv, CMD_START_IBSS);
 	if (ret != CMD_STATUS_COMPLETE) {
 		err("%s start_ibss failed to complete,%d",
-		    dev->netdev->name, ret);
+		    priv->netdev->name, ret);
 		goto end_startibss;
 	}
 
-	ret = at76_get_current_bssid(dev);
+	ret = at76_get_current_bssid(priv);
 	if (ret < 0)
 		goto end_startibss;
 
-	ret = at76_get_current_channel(dev);
+	ret = at76_get_current_channel(priv);
 	if (ret < 0)
 		goto end_startibss;
 
 	/* not sure what this is good for ??? */
-	memset(&dev->mib_buf, 0, sizeof(struct set_mib_buffer));
-	dev->mib_buf.type = MIB_MAC_MGMT;
-	dev->mib_buf.size = 1;
-	dev->mib_buf.index = IBSS_CHANGE_OK_OFFSET;
-	ret = at76_set_mib(dev, &dev->mib_buf);
+	memset(&priv->mib_buf, 0, sizeof(struct set_mib_buffer));
+	priv->mib_buf.type = MIB_MAC_MGMT;
+	priv->mib_buf.size = 1;
+	priv->mib_buf.index = IBSS_CHANGE_OK_OFFSET;
+	ret = at76_set_mib(priv, &priv->mib_buf);
 	if (ret < 0) {
-		err("%s: set_mib (ibss change ok) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (ibss change ok) failed: %d", priv->netdev->name, ret);
 		goto end_startibss;
 	}
 
-	netif_carrier_on(dev->netdev);
-	netif_start_queue(dev->netdev);
+	netif_carrier_on(priv->netdev);
+	netif_start_queue(priv->netdev);
 
   end_startibss:
-	up(&dev->sem);
+	up(&priv->sem);
 }
 
 
 static void at76_work_submit_rx(struct work_struct *work)
 {
-	struct at76_priv *dev = container_of(work, struct at76_priv,
+	struct at76_priv *priv = container_of(work, struct at76_priv,
 					     work_submit_rx);
 
-	down(&dev->sem);
-	at76_submit_rx_urb(dev);
-	up(&dev->sem);
+	down(&priv->sem);
+	at76_submit_rx_urb(priv);
+	up(&priv->sem);
 }
 
 
 /* we got an association response */
-static void at76_rx_mgmt_assoc(struct at76_priv *dev,
+static void at76_rx_mgmt_assoc(struct at76_priv *priv,
 			       struct at76_rx_buffer *buf)
 {
 	struct ieee80211_assoc_response *resp =
@@ -4905,36 +4905,36 @@ static void at76_rx_mgmt_assoc(struct at76_priv *dev,
 	u16 capa = le16_to_cpu(resp->capability);
 	at76_dbg(DBG_RX_MGMT, "%s: rx AssocResp bssid %s capa x%04x status x%04x "
 	         "assoc_id x%04x rates %s",
-	    dev->netdev->name, mac2str(mgmt->addr3), capa, status, assoc_id,
-	    hex2str(dev->obuf, resp->info_element->data,
-		    min((size_t)resp->info_element->len, (sizeof(dev->obuf)-1)/2), '\0'));
-	if (dev->istate == ASSOCIATING) {
-		at76_assert(dev->curr_bss != NULL);
-		if (dev->curr_bss == NULL)
+	    priv->netdev->name, mac2str(mgmt->addr3), capa, status, assoc_id,
+	    hex2str(priv->obuf, resp->info_element->data,
+		    min((size_t)resp->info_element->len, (sizeof(priv->obuf)-1)/2), '\0'));
+	if (priv->istate == ASSOCIATING) {
+		at76_assert(priv->curr_bss != NULL);
+		if (priv->curr_bss == NULL)
 			return;
 
 		if (status == WLAN_STATUS_SUCCESS) {
-			struct bss_info *ptr = dev->curr_bss;
+			struct bss_info *ptr = priv->curr_bss;
 			ptr->assoc_id = assoc_id & 0x3fff;
 			/* update iwconfig params */
-			memcpy(dev->bssid, ptr->bssid, ETH_ALEN);
-			memcpy(dev->essid, ptr->ssid, ptr->ssid_len);
-			dev->essid_size = ptr->ssid_len;
-			dev->channel = ptr->channel;
-			schedule_work(&dev->work_assoc_done);
+			memcpy(priv->bssid, ptr->bssid, ETH_ALEN);
+			memcpy(priv->essid, ptr->ssid, ptr->ssid_len);
+			priv->essid_size = ptr->ssid_len;
+			priv->channel = ptr->channel;
+			schedule_work(&priv->work_assoc_done);
 		} else {
-			dev->istate = JOINING;
-			schedule_work(&dev->work_join);
+			priv->istate = JOINING;
+			schedule_work(&priv->work_join);
 		}
-		del_timer_sync(&dev->mgmt_timer);
+		del_timer_sync(&priv->mgmt_timer);
 	} else {
 		info("%s: AssocResp in state %d ignored",
-		     dev->netdev->name, dev->istate);
+		     priv->netdev->name, priv->istate);
 	}
 }
 
 
-static void at76_rx_mgmt_reassoc(struct at76_priv *dev,
+static void at76_rx_mgmt_reassoc(struct at76_priv *priv,
 				 struct at76_rx_buffer *buf)
 {
 	struct ieee80211_assoc_response *resp =
@@ -4947,48 +4947,48 @@ static void at76_rx_mgmt_reassoc(struct at76_priv *dev,
 
 	at76_dbg(DBG_RX_MGMT, "%s: rx ReAssocResp bssid %s capa x%04x status x%04x "
 	         "assoc_id x%04x rates %s",
-	         dev->netdev->name, mac2str(mgmt->addr3), capa, status, assoc_id,
-	         hex2str(dev->obuf, resp->info_element->data,
+	         priv->netdev->name, mac2str(mgmt->addr3), capa, status, assoc_id,
+	         hex2str(priv->obuf, resp->info_element->data,
 		    min((size_t) resp->info_element->len,
-			(sizeof(dev->obuf) - 1) / 2), '\0'));
-	if (dev->istate == REASSOCIATING) {
-		at76_assert(dev->new_bss != NULL);
-		if (dev->new_bss == NULL)
+			(sizeof(priv->obuf) - 1) / 2), '\0'));
+	if (priv->istate == REASSOCIATING) {
+		at76_assert(priv->new_bss != NULL);
+		if (priv->new_bss == NULL)
 			return;
 
 		if (status == WLAN_STATUS_SUCCESS) {
-			struct bss_info *bptr = dev->new_bss;
+			struct bss_info *bptr = priv->new_bss;
 			bptr->assoc_id = assoc_id;
-			dev->istate = CONNECTED;
+			priv->istate = CONNECTED;
 
-			at76_iwevent_bss_connect(dev->netdev, bptr->bssid);
+			at76_iwevent_bss_connect(priv->netdev, bptr->bssid);
 
-			spin_lock_irqsave(&dev->bss_list_spinlock, flags);
-			dev->curr_bss = dev->new_bss;
-			dev->new_bss = NULL;
-			spin_unlock_irqrestore(&dev->bss_list_spinlock, flags);
+			spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+			priv->curr_bss = priv->new_bss;
+			priv->new_bss = NULL;
+			spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
 
-			/* get ESSID, BSSID and channel for dev->curr_bss */
-			dev->essid_size = bptr->ssid_len;
-			memcpy(dev->essid, bptr->ssid, bptr->ssid_len);
-			memcpy(dev->bssid, bptr->bssid, ETH_ALEN);
-			dev->channel = bptr->channel;
+			/* get ESSID, BSSID and channel for priv->curr_bss */
+			priv->essid_size = bptr->ssid_len;
+			memcpy(priv->essid, bptr->ssid, bptr->ssid_len);
+			memcpy(priv->bssid, bptr->bssid, ETH_ALEN);
+			priv->channel = bptr->channel;
 			at76_dbg(DBG_PROGRESS, "%s: reassociated to BSSID %s",
-			         dev->netdev->name, mac2str(dev->bssid));
-			schedule_work(&dev->work_assoc_done);
+			         priv->netdev->name, mac2str(priv->bssid));
+			schedule_work(&priv->work_assoc_done);
 		} else {
-			del_timer_sync(&dev->mgmt_timer);
-			dev->istate = JOINING;
-			schedule_work(&dev->work_join);
+			del_timer_sync(&priv->mgmt_timer);
+			priv->istate = JOINING;
+			schedule_work(&priv->work_join);
 		}
 	} else {
 		info("%s: ReAssocResp in state %d ignored",
-		     dev->netdev->name, dev->istate);
+		     priv->netdev->name, priv->istate);
 	}
 }
 
 
-static void at76_rx_mgmt_disassoc(struct at76_priv *dev,
+static void at76_rx_mgmt_disassoc(struct at76_priv *priv,
 				  struct at76_rx_buffer *buf)
 {
 	struct ieee80211_disassoc *resp =
@@ -4996,51 +4996,51 @@ static void at76_rx_mgmt_disassoc(struct at76_priv *dev,
 	struct ieee80211_hdr_3addr *mgmt = &resp->header;
 
 	at76_dbg(DBG_RX_MGMT, "%s: rx DisAssoc bssid %s reason x%04x destination %s",
-	         dev->netdev->name, mac2str(mgmt->addr3),
+	         priv->netdev->name, mac2str(mgmt->addr3),
 	         le16_to_cpu(resp->reason),
-	         hex2str(dev->obuf, mgmt->addr1,
-		    min((int)sizeof(dev->obuf) / 3, ETH_ALEN), ':'));
-	if (dev->istate == SCANNING || dev->istate == INIT)
+	         hex2str(priv->obuf, mgmt->addr1,
+		    min((int)sizeof(priv->obuf) / 3, ETH_ALEN), ':'));
+	if (priv->istate == SCANNING || priv->istate == INIT)
 		return;
 
-	at76_assert(dev->curr_bss != NULL);
-	if (dev->curr_bss == NULL)
+	at76_assert(priv->curr_bss != NULL);
+	if (priv->curr_bss == NULL)
 		return;
-	if (dev->istate == REASSOCIATING) {
-		at76_assert(dev->new_bss != NULL);
-		if (dev->new_bss == NULL)
+	if (priv->istate == REASSOCIATING) {
+		at76_assert(priv->new_bss != NULL);
+		if (priv->new_bss == NULL)
 			return;
 	}
-	if (!compare_ether_addr(mgmt->addr3, dev->curr_bss->bssid) &&
-	    (!compare_ether_addr(dev->netdev->dev_addr, mgmt->addr1) ||
+	if (!compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid) &&
+	    (!compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1) ||
 	     is_broadcast_ether_addr(mgmt->addr1))) {
 		/* this is a DisAssoc from the BSS we are connected or
 		   trying to connect to, directed to us or broadcasted */
 		/* jal: TODO: can the DisAssoc also come from the BSS
-		   we've sent a ReAssocReq to (i.e. from dev->new_bss) ? */
-		if (dev->istate == DISASSOCIATING ||
-		    dev->istate == ASSOCIATING ||
-		    dev->istate == REASSOCIATING ||
-		    dev->istate == CONNECTED || dev->istate == JOINING) {
-			if (dev->istate == CONNECTED) {
-				netif_carrier_off(dev->netdev);
-				netif_stop_queue(dev->netdev);
-				at76_iwevent_bss_disconnect(dev->netdev);
+		   we've sent a ReAssocReq to (i.e. from priv->new_bss) ? */
+		if (priv->istate == DISASSOCIATING ||
+		    priv->istate == ASSOCIATING ||
+		    priv->istate == REASSOCIATING ||
+		    priv->istate == CONNECTED || priv->istate == JOINING) {
+			if (priv->istate == CONNECTED) {
+				netif_carrier_off(priv->netdev);
+				netif_stop_queue(priv->netdev);
+				at76_iwevent_bss_disconnect(priv->netdev);
 			}
-			del_timer_sync(&dev->mgmt_timer);
-			dev->istate = JOINING;
-			schedule_work(&dev->work_join);
+			del_timer_sync(&priv->mgmt_timer);
+			priv->istate = JOINING;
+			schedule_work(&priv->work_join);
 		} else {
 			/* ignore DisAssoc in states AUTH, ASSOC */
 			info("%s: DisAssoc in state %d ignored",
-			     dev->netdev->name, dev->istate);
+			     priv->netdev->name, priv->istate);
 		}
 	}
 	/* ignore DisAssoc to other STA or from other BSSID */
 }
 
 
-static void at76_rx_mgmt_auth(struct at76_priv *dev, struct at76_rx_buffer *buf)
+static void at76_rx_mgmt_auth(struct at76_priv *priv, struct at76_rx_buffer *buf)
 {
 	struct ieee80211_auth *resp = (struct ieee80211_auth *)buf->packet;
 	struct ieee80211_hdr_3addr *mgmt = &resp->header;
@@ -5050,65 +5050,65 @@ static void at76_rx_mgmt_auth(struct at76_priv *dev, struct at76_rx_buffer *buf)
 
 	at76_dbg(DBG_RX_MGMT, "%s: rx AuthFrame bssid %s alg %d seq_nr %d status %d "
 	         "destination %s",
-	         dev->netdev->name, mac2str(mgmt->addr3),
+	         priv->netdev->name, mac2str(mgmt->addr3),
 	         alg, seq_nr, status,
-	         hex2str(dev->obuf, mgmt->addr1,
-		    min((int)sizeof(dev->obuf) / 3, ETH_ALEN), ':'));
+	         hex2str(priv->obuf, mgmt->addr1,
+		    min((int)sizeof(priv->obuf) / 3, ETH_ALEN), ':'));
 
 	if (alg == WLAN_AUTH_SHARED_KEY && seq_nr == 2) {
 		at76_dbg(DBG_RX_MGMT, "%s: AuthFrame challenge %s ...",
-		         dev->netdev->name,
-		         hex2str(dev->obuf, resp->info_element,
-			    min((int)sizeof(dev->obuf) / 3, 18), ' '));
+		         priv->netdev->name,
+		         hex2str(priv->obuf, resp->info_element,
+			    min((int)sizeof(priv->obuf) / 3, 18), ' '));
 	}
-	if (dev->istate != AUTHENTICATING) {
+	if (priv->istate != AUTHENTICATING) {
 		info("%s: ignored AuthFrame in state %d",
-		     dev->netdev->name, dev->istate);
+		     priv->netdev->name, priv->istate);
 		return;
 	}
-	if (dev->auth_mode != alg) {
+	if (priv->auth_mode != alg) {
 		info("%s: ignored AuthFrame for alg %d",
-		     dev->netdev->name, alg);
+		     priv->netdev->name, alg);
 		return;
 	}
 
-	at76_assert(dev->curr_bss != NULL);
-	if (dev->curr_bss == NULL)
+	at76_assert(priv->curr_bss != NULL);
+	if (priv->curr_bss == NULL)
 		return;
 
-	if (!compare_ether_addr(mgmt->addr3, dev->curr_bss->bssid) &&
-	    !compare_ether_addr(dev->netdev->dev_addr, mgmt->addr1)) {
+	if (!compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid) &&
+	    !compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1)) {
 		/* this is a AuthFrame from the BSS we are connected or
 		   trying to connect to, directed to us */
 		if (status != WLAN_STATUS_SUCCESS) {
-			del_timer_sync(&dev->mgmt_timer);
+			del_timer_sync(&priv->mgmt_timer);
 			/* try to join next bss */
-			dev->istate = JOINING;
-			schedule_work(&dev->work_join);
+			priv->istate = JOINING;
+			schedule_work(&priv->work_join);
 			return;
 		}
 
-		if (dev->auth_mode == WLAN_AUTH_OPEN || seq_nr == 4) {
-			dev->retries = ASSOC_RETRIES;
-			dev->istate = ASSOCIATING;
-			at76_assoc_req(dev, dev->curr_bss);
+		if (priv->auth_mode == WLAN_AUTH_OPEN || seq_nr == 4) {
+			priv->retries = ASSOC_RETRIES;
+			priv->istate = ASSOCIATING;
+			at76_assoc_req(priv, priv->curr_bss);
 			at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
 			         __FUNCTION__, __LINE__);
-			mod_timer(&dev->mgmt_timer, jiffies + HZ);
+			mod_timer(&priv->mgmt_timer, jiffies + HZ);
 			return;
 		}
 
 		at76_assert(seq_nr == 2);
-		at76_auth_req(dev, dev->curr_bss, seq_nr + 1, resp->info_element);
+		at76_auth_req(priv, priv->curr_bss, seq_nr + 1, resp->info_element);
 		at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
 		         __FUNCTION__, __LINE__);
-		mod_timer(&dev->mgmt_timer, jiffies + HZ);
+		mod_timer(&priv->mgmt_timer, jiffies + HZ);
 	}
 	/* else: ignore AuthFrames to other recipients */
 }
 
 
-static void at76_rx_mgmt_deauth(struct at76_priv *dev,
+static void at76_rx_mgmt_deauth(struct at76_priv *priv,
 				struct at76_rx_buffer *buf)
 {
 	struct ieee80211_disassoc *resp =
@@ -5117,41 +5117,41 @@ static void at76_rx_mgmt_deauth(struct at76_priv *dev,
 
 	at76_dbg(DBG_RX_MGMT | DBG_PROGRESS,
 	         "%s: rx DeAuth bssid %s reason x%04x destination %s",
-	         dev->netdev->name, mac2str(mgmt->addr3),
+	         priv->netdev->name, mac2str(mgmt->addr3),
 	         le16_to_cpu(resp->reason),
-	         hex2str(dev->obuf, mgmt->addr1,
-		    min((int)sizeof(dev->obuf) / 3, ETH_ALEN), ':'));
-	if (dev->istate == DISASSOCIATING ||
-	    dev->istate == AUTHENTICATING ||
-	    dev->istate == ASSOCIATING ||
-	    dev->istate == REASSOCIATING  ||
-	    dev->istate == CONNECTED) {
-		at76_assert(dev->curr_bss != NULL);
-		if (dev->curr_bss == NULL)
+	         hex2str(priv->obuf, mgmt->addr1,
+		    min((int)sizeof(priv->obuf) / 3, ETH_ALEN), ':'));
+	if (priv->istate == DISASSOCIATING ||
+	    priv->istate == AUTHENTICATING ||
+	    priv->istate == ASSOCIATING ||
+	    priv->istate == REASSOCIATING  ||
+	    priv->istate == CONNECTED) {
+		at76_assert(priv->curr_bss != NULL);
+		if (priv->curr_bss == NULL)
 			return;
 
-		if (!compare_ether_addr(mgmt->addr3, dev->curr_bss->bssid) &&
-		    (!compare_ether_addr(dev->netdev->dev_addr, mgmt->addr1) ||
+		if (!compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid) &&
+		    (!compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1) ||
 		     is_broadcast_ether_addr(mgmt->addr1))) {
 			/* this is a DeAuth from the BSS we are connected or
 			   trying to connect to, directed to us or broadcasted */
-			if (dev->istate == CONNECTED) {
-				at76_iwevent_bss_disconnect(dev->netdev);
+			if (priv->istate == CONNECTED) {
+				at76_iwevent_bss_disconnect(priv->netdev);
 			}
-			dev->istate = JOINING;
-			schedule_work(&dev->work_join);
-			del_timer_sync(&dev->mgmt_timer);
+			priv->istate = JOINING;
+			schedule_work(&priv->work_join);
+			del_timer_sync(&priv->mgmt_timer);
 		}
 		/* ignore DeAuth to other STA or from other BSSID */
 	} else {
 		/* ignore DeAuth in states SCANNING */
 		info("%s: DeAuth in state %d ignored",
-		     dev->netdev->name, dev->istate);
+		     priv->netdev->name, priv->istate);
 	}
 }
 
 
-static void at76_rx_mgmt_beacon(struct at76_priv *dev,
+static void at76_rx_mgmt_beacon(struct at76_priv *priv,
 				struct at76_rx_buffer *buf)
 {
 	/* beacon content */
@@ -5174,17 +5174,17 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 	int keep_going = 1;
 	unsigned long flags;
 
-	spin_lock_irqsave(&dev->bss_list_spinlock, flags);
-	if (dev->istate == CONNECTED) {
+	spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+	if (priv->istate == CONNECTED) {
 		/* in state CONNECTED we use the mgmt_timer to control
 		   the beacon of the BSS */
-		at76_assert(dev->curr_bss != NULL);
-		if (dev->curr_bss == NULL)
+		at76_assert(priv->curr_bss != NULL);
+		if (priv->curr_bss == NULL)
 			goto rx_mgmt_beacon_end;
-		if (!compare_ether_addr(dev->curr_bss->bssid, mgmt->addr3)) {
-			mod_timer(&dev->mgmt_timer, jiffies+BEACON_TIMEOUT*HZ);
-			dev->curr_bss->rssi = buf->rssi;
-			dev->beacons_received++;
+		if (!compare_ether_addr(priv->curr_bss->bssid, mgmt->addr3)) {
+			mod_timer(&priv->mgmt_timer, jiffies+BEACON_TIMEOUT*HZ);
+			priv->curr_bss->rssi = buf->rssi;
+			priv->beacons_received++;
 			goto rx_mgmt_beacon_end;
 		}
 	}
@@ -5192,8 +5192,8 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 	/* look if we have this BSS already in the list */
 	match = NULL;
 
-	if (!list_empty(&dev->bss_list)) {
-		list_for_each(lptr, &dev->bss_list) {
+	if (!list_empty(&priv->bss_list)) {
+		list_for_each(lptr, &priv->bss_list) {
 			struct bss_info *bss_ptr =
 			    list_entry(lptr, struct bss_info, list);
 			if (!compare_ether_addr(bss_ptr->bssid, mgmt->addr3)) {
@@ -5207,13 +5207,13 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 		/* haven't found the bss in the list */
 		if ((match=kmalloc(sizeof(struct bss_info), GFP_ATOMIC)) == NULL) {
 			at76_dbg(DBG_BSS_TABLE, "%s: cannot kmalloc new bss info (%zd byte)",
-		          	    dev->netdev->name, sizeof(struct bss_info));
+		          	    priv->netdev->name, sizeof(struct bss_info));
 			goto rx_mgmt_beacon_end;
 		}
 		memset(match, 0, sizeof(*match));
 		new_entry = 1;
 		/* append new struct into list */
-		list_add_tail(&match->list, &dev->bss_list);
+		list_add_tail(&match->list, &priv->bss_list);
 	}
 
 	/* we either overwrite an existing entry or append a new one
@@ -5228,7 +5228,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 	match->link_qual = buf->link_quality;
 	match->noise_level = buf->noise_level;
 	memcpy(match->bssid, mgmt->addr3, ETH_ALEN);
-	at76_dbg(DBG_RX_BEACON, "%s: bssid %s", dev->netdev->name,
+	at76_dbg(DBG_RX_BEACON, "%s: bssid %s", priv->netdev->name,
 	         mac2str(match->bssid));
 
 	tlv = bdata->info_element;
@@ -5268,7 +5268,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 								   string for
 								   printing */
 				at76_dbg(DBG_RX_BEACON, "%s: SSID - %s",
-				         dev->netdev->name, match->ssid);
+				         priv->netdev->name, match->ssid);
 			}
 			have_ssid = 1;
 			break;
@@ -5282,9 +5282,9 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 				have_rates = 1;
 				at76_dbg(DBG_RX_BEACON,
 				         "%s: SUPPORTED RATES %s",
-				         dev->netdev->name,
-				         hex2str(dev->obuf, tlv->data,
-					    min_t(int, (sizeof(dev->obuf)-1)/2,
+				         priv->netdev->name,
+				         hex2str(priv->obuf, tlv->data,
+					    min_t(int, (sizeof(priv->obuf)-1)/2,
 						  tlv->len), '\0'));
 			}
 			break;
@@ -5294,7 +5294,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 				match->channel = tlv->data[0];
 				have_channel = 1;
 				at76_dbg(DBG_RX_BEACON, "%s: CHANNEL - %d",
-				         dev->netdev->name, match->channel);
+				         priv->netdev->name, match->channel);
 			}
 			break;
 
@@ -5303,9 +5303,9 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 		case MFIE_TYPE_IBSS_SET:
 		default:
 			at76_dbg(DBG_RX_BEACON, "%s: beacon IE id %d len %d %s",
-			         dev->netdev->name, tlv->id, tlv->len,
-			         hex2str(dev->obuf, tlv->data,
-				    min_t(int, (sizeof(dev->obuf)-1)/2,
+			         priv->netdev->name, tlv->id, tlv->len,
+			         hex2str(priv->obuf, tlv->data,
+				    min_t(int, (sizeof(priv->obuf)-1)/2,
 					  tlv->len), '\0'));
 			break;
 		}
@@ -5323,17 +5323,17 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev,
 	}
 
 	at76_dbg(DBG_RX_BEACON, "%s: Finished processing beacon data",
-	         dev->netdev->name);
+	         priv->netdev->name);
 
 	match->last_rx = jiffies; /* record last rx of beacon */
 
 rx_mgmt_beacon_end:
-	spin_unlock_irqrestore(&dev->bss_list_spinlock, flags);
+	spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
 }
 
 
 /* calc the link level from a given rx_buffer */
-static void at76_calc_level(struct at76_priv *dev, struct at76_rx_buffer *buf,
+static void at76_calc_level(struct at76_priv *priv, struct at76_rx_buffer *buf,
 			    struct iw_quality *qual)
 {
 	int max_rssi = 42;	/* just a guess for now, might be different for other chips */
@@ -5346,25 +5346,25 @@ static void at76_calc_level(struct at76_priv *dev, struct at76_rx_buffer *buf,
 
 
 /* calc the link quality from a given rx_buffer */
-static void at76_calc_qual(struct at76_priv *dev, struct at76_rx_buffer *buf,
+static void at76_calc_qual(struct at76_priv *priv, struct at76_rx_buffer *buf,
 			   struct iw_quality* qual)
 {
-	if ((dev->board_type == BOARDTYPE_503_INTERSIL_3861) ||
-	    (dev->board_type == BOARDTYPE_503_INTERSIL_3863)) {
+	if ((priv->board_type == BOARDTYPE_503_INTERSIL_3861) ||
+	    (priv->board_type == BOARDTYPE_503_INTERSIL_3863)) {
 		qual->qual = buf->link_quality;
 	} else {
 		unsigned long msec;
 
 		/* Update qual at most once a second */
-		msec = jiffies_to_msecs(jiffies) - dev->beacons_last_qual;
+		msec = jiffies_to_msecs(jiffies) - priv->beacons_last_qual;
 		if (msec < 1000)
 			return;
 
-		qual->qual = qual->level * dev->beacons_received *
-		    dev->beacon_period / msec;
+		qual->qual = qual->level * priv->beacons_received *
+		    priv->beacon_period / msec;
 
-		dev->beacons_last_qual = jiffies_to_msecs(jiffies);
-		dev->beacons_received = 0;
+		priv->beacons_last_qual = jiffies_to_msecs(jiffies);
+		priv->beacons_received = 0;
 	}
 	qual->qual = (qual->qual > 100) ? 100 : qual->qual;
 	qual->updated |= IW_QUAL_QUAL_UPDATED;
@@ -5372,7 +5372,7 @@ static void at76_calc_qual(struct at76_priv *dev, struct at76_rx_buffer *buf,
 
 
 /* calc the noise quality from a given rx_buffer */
-static void at76_calc_noise(struct at76_priv *dev, struct at76_rx_buffer *buf,
+static void at76_calc_noise(struct at76_priv *priv, struct at76_rx_buffer *buf,
 			    struct iw_quality *qual)
 {
 	qual->noise = 0;
@@ -5380,16 +5380,16 @@ static void at76_calc_noise(struct at76_priv *dev, struct at76_rx_buffer *buf,
 }
 
 
-static void at76_update_wstats(struct at76_priv *dev,
+static void at76_update_wstats(struct at76_priv *priv,
 			       struct at76_rx_buffer *buf)
 {
-	struct iw_quality *qual = &dev->wstats.qual;
+	struct iw_quality *qual = &priv->wstats.qual;
 
-	if (buf->rssi && dev->istate == CONNECTED) {
+	if (buf->rssi && priv->istate == CONNECTED) {
 		qual->updated = 0;
-		at76_calc_level(dev, buf, qual);
-		at76_calc_qual(dev, buf, qual);
-		at76_calc_noise(dev, buf, qual);
+		at76_calc_level(priv, buf, qual);
+		at76_calc_qual(priv, buf, qual);
+		at76_calc_noise(priv, buf, qual);
 	} else {
 		qual->qual = 0;
 		qual->level = 0;
@@ -5399,60 +5399,60 @@ static void at76_update_wstats(struct at76_priv *dev,
 }
 
 
-static void at76_rx_mgmt(struct at76_priv *dev, struct at76_rx_buffer *buf)
+static void at76_rx_mgmt(struct at76_priv *priv, struct at76_rx_buffer *buf)
 {
 	struct ieee80211_hdr_3addr *mgmt =
 	    (struct ieee80211_hdr_3addr *)buf->packet;
 	u16 subtype = le16_to_cpu(mgmt->frame_ctl) & IEEE80211_FCTL_STYPE;
 
 	/* update wstats */
-	if (dev->istate != INIT && dev->istate != SCANNING) {
+	if (priv->istate != INIT && priv->istate != SCANNING) {
 		/* jal: this is a dirty hack needed by Tim in ad-hoc mode */
-		if (dev->iw_mode == IW_MODE_ADHOC || (dev->curr_bss != NULL &&
-		     !compare_ether_addr(mgmt->addr3, dev->curr_bss->bssid))) {
+		if (priv->iw_mode == IW_MODE_ADHOC || (priv->curr_bss != NULL &&
+		     !compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid))) {
 			/* Data packets always seem to have a 0 link level, so we
 			   only read link quality info from management packets.
 			   Atmel driver actually averages the present, and previous
 			   values, we just present the raw value at the moment - TJS */
-			at76_update_wstats(dev, buf);
+			at76_update_wstats(priv, buf);
 		}
 	}
 
 	at76_dbg(DBG_RX_MGMT_CONTENT, "%s rx mgmt subtype x%x %s",
-		 dev->netdev->name, subtype,
-		 hex2str(dev->obuf, mgmt,
-		     min((sizeof(dev->obuf) - 1) / 2,
+		 priv->netdev->name, subtype,
+		 hex2str(priv->obuf, mgmt,
+		     min((sizeof(priv->obuf) - 1) / 2,
 		         (size_t) le16_to_cpu(buf->wlength)), '\0'));
 
 	switch (subtype) {
 	case IEEE80211_STYPE_BEACON:
 	case IEEE80211_STYPE_PROBE_RESP:
-		at76_rx_mgmt_beacon(dev, buf);
+		at76_rx_mgmt_beacon(priv, buf);
 		break;
 
 	case IEEE80211_STYPE_ASSOC_RESP:
-		at76_rx_mgmt_assoc(dev, buf);
+		at76_rx_mgmt_assoc(priv, buf);
 		break;
 
 	case IEEE80211_STYPE_REASSOC_RESP:
-		at76_rx_mgmt_reassoc(dev, buf);
+		at76_rx_mgmt_reassoc(priv, buf);
 		break;
 
 	case IEEE80211_STYPE_DISASSOC:
-		at76_rx_mgmt_disassoc(dev, buf);
+		at76_rx_mgmt_disassoc(priv, buf);
 		break;
 
 	case IEEE80211_STYPE_AUTH:
-		at76_rx_mgmt_auth(dev, buf);
+		at76_rx_mgmt_auth(priv, buf);
 		break;
 
 	case IEEE80211_STYPE_DEAUTH:
-		at76_rx_mgmt_deauth(dev, buf);
+		at76_rx_mgmt_deauth(priv, buf);
 		break;
 
 	default:
 		info("%s: mgmt, but not beacon, subtype = %x",
-		     dev->netdev->name, subtype);
+		     priv->netdev->name, subtype);
 	}
 
 	return;
@@ -5496,8 +5496,8 @@ static void at76_ieee80211_to_eth(struct sk_buff *skb, int iw_mode)
 	i802_11_hdr = (struct ieee80211_hdr_3addr *)skb->data;
 
 	dbg("%s: ENTRY skb len %d data %s", __FUNCTION__,
-	    skb->len, hex2str(dev->obuf, skb->data,
-			      min((int)sizeof(dev->obuf) / 3, 64), ' '));
+	    skb->len, hex2str(priv->obuf, skb->data,
+			      min((int)sizeof(priv->obuf) / 3, 64), ' '));
 
 	skb_pull(skb, sizeof(struct ieee80211_hdr_3addr));
 
@@ -5567,8 +5567,8 @@ static void at76_ieee80211_to_eth(struct sk_buff *skb, int iw_mode)
 	    hex2str(da, eth_hdr(skb)->h_dest, ETH_ALEN, ':'),
 	    hex2str(sa, eth_hdr(skb)->h_source, ETH_ALEN, ':'),
 	    ntohs(skb->protocol), skb->len,
-	    hex2str(dev->obuf, skb->data,
-		    min((int)sizeof(dev->obuf)/3,64), ' '));
+	    hex2str(priv->obuf, skb->data,
+		    min((int)sizeof(priv->obuf)/3,64), ' '));
 }
 
 
@@ -5629,16 +5629,16 @@ static void at76_ieee80211_fixup(struct sk_buff *skb, int iw_mode)
 }
 
 
-/* check for fragmented data in dev->rx_skb. If the packet was no fragment
+/* check for fragmented data in priv->rx_skb. If the packet was no fragment
    or it was the last of a fragment set a skb containing the whole packet
    is returned for further processing. Otherwise we get NULL and are
    done and the packet is either stored inside the fragment buffer
    or thrown away. The check for rx_copybreak is moved here.
    Every returned skb starts with the ieee802_11 header and contains
    _no_ FCS at the end */
-static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
+static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *priv)
 {
-	struct sk_buff *skb = dev->rx_skb;
+	struct sk_buff *skb = priv->rx_skb;
 	struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb->data;
 	struct ieee80211_hdr_3addr *i802_11_hdr =
 	    (struct ieee80211_hdr_3addr *)buf->packet;
@@ -5650,7 +5650,7 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 
 	/* length including the IEEE802.11 header, excl. the trailing FCS,
 	   excl. the struct at76_rx_buffer */
-	int length = le16_to_cpu(buf->wlength) - dev->rx_data_fcs_len;
+	int length = le16_to_cpu(buf->wlength) - priv->rx_data_fcs_len;
 
 	/* where does the data payload start in skb->data ? */
 	u8 *data = (u8 *)i802_11_hdr + sizeof(struct ieee80211_hdr_3addr);
@@ -5664,20 +5664,20 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 
 	at76_dbg(DBG_RX_FRAGS, "%s: rx data frame_ctl %04x addr2 %s seq/frag %d/%d "
 	         "length %d data %d: %s ...",
-	         dev->netdev->name, frame_ctl,
+	         priv->netdev->name, frame_ctl,
 	         mac2str(i802_11_hdr->addr2),
 	         seqnr, fragnr, length, data_len,
-	         hex2str(dev->obuf, data,
-		    min((int)(sizeof(dev->obuf) - 1) / 2, 32), '\0'));
+	         hex2str(priv->obuf, data,
+		    min((int)(sizeof(priv->obuf) - 1) / 2, 32), '\0'));
 
 	at76_dbg(DBG_RX_FRAGS_SKB, "%s: incoming skb: head %p data %p "
 	         "tail %p end %p len %d",
-	         dev->netdev->name, skb->head, skb->data, skb->tail,
+	         priv->netdev->name, skb->head, skb->data, skb->tail,
 	         skb->end, skb->len);
 
 	if (data_len < 0) {
 		/* make sure data starts in the buffer */
-		info("%s: data frame too short", dev->netdev->name);
+		info("%s: data frame too short", priv->netdev->name);
 		return NULL;
 	}
 
@@ -5685,15 +5685,15 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 		/* unfragmented packet received */
 		if (length < rx_copybreak && (skb = dev_alloc_skb(length)) != NULL) {
 			memcpy(skb_put(skb, length),
-			       dev->rx_skb->data + AT76_RX_HDRLEN, length);
+			       priv->rx_skb->data + AT76_RX_HDRLEN, length);
 		} else {
 			skb_pull(skb, AT76_RX_HDRLEN);
 			skb_trim(skb, length);
 			/* Use a new skb for the next receive */
-			dev->rx_skb = NULL;
+			priv->rx_skb = NULL;
 		}
 
-		at76_dbg(DBG_RX_FRAGS, "%s: unfragmented", dev->netdev->name);
+		at76_dbg(DBG_RX_FRAGS, "%s: unfragmented", priv->netdev->name);
 
 		return skb;
 	}
@@ -5709,7 +5709,7 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 
 	at76_dbg(DBG_RX_FRAGS_SKB, "%s: trimmed skb: head %p data %p tail %p "
 	         "end %p len %d data %p data_len %d",
-	         dev->netdev->name, skb->head, skb->data, skb->tail,
+	         priv->netdev->name, skb->head, skb->data, skb->tail,
 	         skb->end, skb->len, data, data_len);
 
 	/* look if we've got a chain for the sender address.
@@ -5719,7 +5719,7 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 	/* determining the oldest entry doesn't cope with jiffies wrapping
 	   but I don't care to delete a young entry at these rare moments ... */
 
-	for(i=0,bptr=dev->rx_data,optr=NULL; i < NR_RX_DATA_BUF; i++,bptr++) {
+	for(i=0,bptr=priv->rx_data,optr=NULL; i < NR_RX_DATA_BUF; i++,bptr++) {
 		if (bptr->skb != NULL) {
 			if (!compare_ether_addr(i802_11_hdr->addr2, bptr->sender))
 				break;
@@ -5741,7 +5741,7 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 
 		at76_dbg(DBG_RX_FRAGS, "%s: %d. cacheentry (seq/frag=%d/%d) "
 		         "matched sender addr",
-		         dev->netdev->name, i, bptr->seqnr, bptr->fragnr);
+		         priv->netdev->name, i, bptr->seqnr, bptr->fragnr);
 
 		/* bptr points to an entry for the sender address */
 		if (bptr->seqnr == seqnr) {
@@ -5756,7 +5756,7 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 				/* for test only ??? */
 				if ((left=skb_tailroom(bptr->skb)) < data_len) {
 					info("%s: only %d byte free (need %d)",
-					    dev->netdev->name, left, data_len);
+					    priv->netdev->name, left, data_len);
 				} else
 					memcpy(skb_put(bptr->skb, data_len),
 					       data, data_len);
@@ -5767,14 +5767,14 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 					skb = bptr->skb;
 					bptr->skb = NULL; /* free the entry */
 					at76_dbg(DBG_RX_FRAGS, "%s: last frag of seq %d",
-					         dev->netdev->name, seqnr);
+					         priv->netdev->name, seqnr);
 					return skb;
 				} else
 					return NULL;
 			} else {
 				/* wrong fragment number -> ignore it */
 				at76_dbg(DBG_RX_FRAGS, "%s: frag nr does not match: %d+1 != %d",
-				         dev->netdev->name, bptr->fragnr, fragnr);
+				         priv->netdev->name, bptr->fragnr, fragnr);
 				return NULL;
 			}
 		} else {
@@ -5784,20 +5784,20 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 				   old one by this */
 				/* bptr->sender has the correct value already */
 				at76_dbg(DBG_RX_FRAGS, "%s: start of new seq %d, "
-				         "removing old seq %d", dev->netdev->name,
+				         "removing old seq %d", priv->netdev->name,
 				         seqnr, bptr->seqnr);
 				bptr->seqnr = seqnr;
 				bptr->fragnr = 0;
 				bptr->last_rx = jiffies;
-				/* swap bptr->skb and dev->rx_skb */
+				/* swap bptr->skb and priv->rx_skb */
 				skb = bptr->skb;
-				bptr->skb = dev->rx_skb;
-				dev->rx_skb = skb;
+				bptr->skb = priv->rx_skb;
+				priv->rx_skb = skb;
 			} else {
 				/* it from the middle of a new chain ->
 				   delete the old entry and skip the new one */
 				at76_dbg(DBG_RX_FRAGS, "%s: middle of new seq %d (%d) "
-				         "removing old seq %d", dev->netdev->name,
+				         "removing old seq %d", priv->netdev->name,
 				         seqnr, fragnr, bptr->seqnr);
 				dev_kfree_skb(bptr->skb);
 				bptr->skb = NULL;
@@ -5811,7 +5811,7 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 		if (fragnr != 0) {
 			/* this is not the begin of a fragment chain ... */
 			at76_dbg(DBG_RX_FRAGS, "%s: no chain for non-first fragment (%d)",
-			         dev->netdev->name, fragnr);
+			         priv->netdev->name, fragnr);
 			return NULL;
 		}
 		at76_assert(optr != NULL);
@@ -5821,19 +5821,19 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 		if (optr->skb != NULL) {
 			/* swap the skb's */
 			skb = optr->skb;
-			optr->skb = dev->rx_skb;
-			dev->rx_skb = skb;
+			optr->skb = priv->rx_skb;
+			priv->rx_skb = skb;
 
 			at76_dbg(DBG_RX_FRAGS, "%s: free old contents: sender %s seq/frag %d/%d",
-			         dev->netdev->name, mac2str(optr->sender),
+			         priv->netdev->name, mac2str(optr->sender),
 			         optr->seqnr, optr->fragnr);
 
 		} else {
-			/* take the skb from dev->rx_skb */
-			optr->skb = dev->rx_skb;
-			dev->rx_skb = NULL; /* let at76_submit_rx_urb() allocate a new skb */
+			/* take the skb from priv->rx_skb */
+			optr->skb = priv->rx_skb;
+			priv->rx_skb = NULL; /* let at76_submit_rx_urb() allocate a new skb */
 
-			at76_dbg(DBG_RX_FRAGS, "%s: use a free entry", dev->netdev->name);
+			at76_dbg(DBG_RX_FRAGS, "%s: use a free entry", priv->netdev->name);
 		}
 		memcpy(optr->sender, i802_11_hdr->addr2, ETH_ALEN);
 		optr->seqnr = seqnr;
@@ -5845,12 +5845,12 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *dev)
 }
 
 
-/* rx interrupt: we expect the complete data buffer in dev->rx_skb */
-static void at76_rx_data(struct at76_priv *dev)
+/* rx interrupt: we expect the complete data buffer in priv->rx_skb */
+static void at76_rx_data(struct at76_priv *priv)
 {
-	struct net_device *netdev = dev->netdev;
-	struct net_device_stats *stats = &dev->stats;
-	struct sk_buff *skb = dev->rx_skb;
+	struct net_device *netdev = priv->netdev;
+	struct net_device_stats *stats = &priv->stats;
+	struct sk_buff *skb = priv->rx_skb;
 	struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb->data;
 	struct ieee80211_hdr_3addr *i802_11_hdr;
 	int length = le16_to_cpu(buf->wlength);
@@ -5862,7 +5862,7 @@ static void at76_rx_data(struct at76_priv *dev)
 	if (at76_debug & DBG_RX_DATA_CONTENT)
 		at76_dbg_dumpbuf("packet", skb->data + AT76_RX_HDRLEN, length);
 
-	if ((skb = at76_check_for_rx_frags(dev)) == NULL)
+	if ((skb = at76_check_for_rx_frags(priv)) == NULL)
 		return;
 
 	/* if an skb is returned, the at76_rx_buffer and the FCS is already removed */
@@ -5881,9 +5881,9 @@ static void at76_rx_data(struct at76_priv *dev)
 	}
 
 	if (netdev->type == ARPHRD_ETHER) {
-		at76_ieee80211_to_eth(skb, dev->iw_mode);
+		at76_ieee80211_to_eth(skb, priv->iw_mode);
 	} else {
-		at76_ieee80211_fixup(skb, dev->iw_mode);
+		at76_ieee80211_fixup(skb, priv->iw_mode);
 	}
 
 	netdev->last_rx = jiffies;
@@ -5895,24 +5895,24 @@ static void at76_rx_data(struct at76_priv *dev)
 }
 
 
-static void at76_rx_monitor_mode(struct at76_priv *dev)
+static void at76_rx_monitor_mode(struct at76_priv *priv)
 {
 	struct at76_rx_radiotap *rt;
 	u8 *payload;
 	int skblen;
-	struct net_device *netdev = dev->netdev;
+	struct net_device *netdev = priv->netdev;
 	struct at76_rx_buffer *buf =
-	    (struct at76_rx_buffer *)dev->rx_skb->data;
+	    (struct at76_rx_buffer *)priv->rx_skb->data;
 	/* length including the IEEE802.11 header and the trailing FCS,
 	   but not at76_rx_buffer */
 	int length = le16_to_cpu(buf->wlength);
-	struct sk_buff *skb = dev->rx_skb;
-	struct net_device_stats *stats = &dev->stats;
+	struct sk_buff *skb = priv->rx_skb;
+	struct net_device_stats *stats = &priv->stats;
 
-	if (length < dev->rx_data_fcs_len) {
+	if (length < priv->rx_data_fcs_len) {
 		/* buffer contains no data */
 		at76_dbg(DBG_MONITOR_MODE, "%s: MONITOR MODE: rx skb without data",
-		         dev->netdev->name);
+		         priv->netdev->name);
 		return;
 	}
 
@@ -5920,7 +5920,7 @@ static void at76_rx_monitor_mode(struct at76_priv *dev)
 
 	if ((skb = dev_alloc_skb(skblen)) == NULL) {
 		err("%s: MONITOR MODE: dev_alloc_skb for radiotap header "
-		    "returned NULL", dev->netdev->name);
+		    "returned NULL", priv->netdev->name);
 		return;
 	}
 
@@ -5941,7 +5941,7 @@ static void at76_rx_monitor_mode(struct at76_priv *dev)
 	rt->rt_flags = 0;
 	if (buf->fragmentation)
 		rt->rt_flags |= IEEE80211_RADIOTAP_F_FRAG;
-	if (dev->rx_data_fcs_len)
+	if (priv->rx_data_fcs_len)
 		rt->rt_flags |= IEEE80211_RADIOTAP_F_FCS;
 
 	memcpy(payload, buf->packet, length);
@@ -5961,7 +5961,7 @@ static void at76_rx_monitor_mode(struct at76_priv *dev)
 /**
  * at76_iwspy_update - check if we spy on the sender address of buf and update stats
  */
-static void at76_iwspy_update(struct at76_priv *dev, struct at76_rx_buffer *buf)
+static void at76_iwspy_update(struct at76_priv *priv, struct at76_rx_buffer *buf)
 {
 	struct ieee80211_hdr_3addr *hdr =
 	    (struct ieee80211_hdr_3addr *)buf->packet;
@@ -5971,32 +5971,32 @@ static void at76_iwspy_update(struct at76_priv *dev, struct at76_rx_buffer *buf)
 	qual.updated = IW_QUAL_QUAL_INVALID | IW_QUAL_NOISE_INVALID;
 	qual.level = 0;
 	qual.noise = 0;
-	at76_calc_level(dev, buf, &qual);
+	at76_calc_level(priv, buf, &qual);
 
-	spin_lock_bh(&(dev->spy_spinlock));
+	spin_lock_bh(&(priv->spy_spinlock));
 
-	if (dev->spy_data.spy_number > 0) {
-		wireless_spy_update(dev->netdev, hdr->addr2, &qual);
+	if (priv->spy_data.spy_number > 0) {
+		wireless_spy_update(priv->netdev, hdr->addr2, &qual);
 	}
-	spin_unlock_bh(&(dev->spy_spinlock));
+	spin_unlock_bh(&(priv->spy_spinlock));
 }
 
 
 static void at76_rx_tasklet(unsigned long param)
 {
-	struct at76_priv *dev = (struct at76_priv *)param;
+	struct at76_priv *priv = (struct at76_priv *)param;
 	struct urb *urb;
 	struct net_device *netdev;
 	struct at76_rx_buffer *buf;
 	struct ieee80211_hdr_3addr *i802_11_hdr;
 	u16 frame_ctl;
 
-	if (!dev)
+	if (!priv)
 		return;
-	urb = dev->rx_urb;
-	netdev = dev->netdev;
+	urb = priv->rx_urb;
+	netdev = priv->netdev;
 
-	if (dev->device_unplugged) {
+	if (priv->device_unplugged) {
 		at76_dbg(DBG_DEVSTART, "device unplugged");
 		if (urb)
 			at76_dbg(DBG_DEVSTART, "urb status %d", urb->status);
@@ -6004,10 +6004,10 @@ static void at76_rx_tasklet(unsigned long param)
 	}
 
 
-	if (!urb || !dev->rx_skb || !netdev || !dev->rx_skb->data)
+	if (!urb || !priv->rx_skb || !netdev || !priv->rx_skb->data)
 		return;
 
-	buf = (struct at76_rx_buffer *)dev->rx_skb->data;
+	buf = (struct at76_rx_buffer *)priv->rx_skb->data;
 
 	if (!buf)
 		return;
@@ -6029,25 +6029,25 @@ static void at76_rx_tasklet(unsigned long param)
 	}
 
 	at76_dbg(DBG_RX_ATMEL_HDR, "%s: rx frame: rate %d rssi %d noise %d link %d %s",
-		 dev->netdev->name,
+		 priv->netdev->name,
 		 buf->rx_rate, buf->rssi, buf->noise_level,
 		 buf->link_quality,
-		 hex2str(dev->obuf, i802_11_hdr,
-			 min((int)(sizeof(dev->obuf)-1)/2,48),'\0'));
-	if (dev->istate == MONITORING) {
-		at76_rx_monitor_mode(dev);
+		 hex2str(priv->obuf, i802_11_hdr,
+			 min((int)(sizeof(priv->obuf)-1)/2,48),'\0'));
+	if (priv->istate == MONITORING) {
+		at76_rx_monitor_mode(priv);
 		goto finish;
 	}
 
 	/* there is a new bssid around, accept it: */
-	if (buf->newbss && dev->iw_mode == IW_MODE_ADHOC) {
+	if (buf->newbss && priv->iw_mode == IW_MODE_ADHOC) {
 		at76_dbg(DBG_PROGRESS, "%s: rx newbss", netdev->name);
-		schedule_work(&dev->work_new_bss);
+		schedule_work(&priv->work_new_bss);
 	}
 
 	switch (frame_ctl & IEEE80211_FCTL_FTYPE) {
 	case IEEE80211_FTYPE_DATA:
-		at76_rx_data(dev);
+		at76_rx_data(priv);
 		break;
 
 	case IEEE80211_FTYPE_MGMT:
@@ -6055,22 +6055,22 @@ static void at76_rx_tasklet(unsigned long param)
 		   other frames than management (might depend on the
 		   radio chip / firmware version !) */
 
-		at76_iwspy_update(dev, buf);
+		at76_iwspy_update(priv, buf);
 
-		at76_rx_mgmt(dev, buf);
+		at76_rx_mgmt(priv, buf);
 		break;
 
 	case IEEE80211_FTYPE_CTL:
 		at76_dbg(DBG_RX_CTRL, "%s: ignored ctrl frame: %04x",
-		         dev->netdev->name, frame_ctl);
+		         priv->netdev->name, frame_ctl);
 		break;
 
 	default:
-		info("%s: it's a frame from mars: %2x", dev->netdev->name,
+		info("%s: it's a frame from mars: %2x", priv->netdev->name,
 		     frame_ctl);
 	}
  finish:
-	at76_submit_rx_urb(dev);
+	at76_submit_rx_urb(priv);
  no_more_urb:
 	return;
 }
@@ -6080,7 +6080,7 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev,
 					       int board_type)
 {
 	struct net_device *netdev;
-	struct at76_priv *dev = NULL;
+	struct at76_priv *priv = NULL;
 	int i;
 
 	/* allocate memory for our device state and initialize it */
@@ -6091,73 +6091,73 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev,
 	}
 
 	SET_NETDEV_DEV(netdev, &udev->dev);
-	dev = netdev_priv(netdev);
-	memset(dev, 0, sizeof(*dev));
-
-	dev->udev = udev;
-	dev->netdev = netdev;
-
-	init_MUTEX(&dev->sem);
-	INIT_WORK(&dev->work_assoc_done, at76_work_assoc_done);
-	INIT_WORK(&dev->work_external_fw, at76_work_external_fw);
-	INIT_WORK(&dev->work_internal_fw, at76_work_internal_fw);
-	INIT_WORK(&dev->work_join, at76_work_join);
-	INIT_WORK(&dev->work_mgmt_timeout, at76_work_mgmt_timeout);
-	INIT_WORK(&dev->work_new_bss, at76_work_new_bss);
-	INIT_WORK(&dev->work_reset_device, at76_work_reset_device);
-	INIT_WORK(&dev->work_restart, at76_work_restart);
-	INIT_WORK(&dev->work_scan, at76_work_scan);
-	INIT_WORK(&dev->work_set_promisc, at76_work_set_promisc);
-	INIT_WORK(&dev->work_start_ibss, at76_work_start_ibss);
-	INIT_WORK(&dev->work_submit_rx, at76_work_submit_rx);
-
-	dev->open_count = 0;
-
-	init_timer(&dev->restart_timer);
-	dev->restart_timer.data = (unsigned long)dev;
-	dev->restart_timer.function = at76_restart_timeout;
-
-	init_timer(&dev->mgmt_timer);
-	dev->mgmt_timer.data = (unsigned long)dev;
-	dev->mgmt_timer.function = at76_mgmt_timeout;
-
-	init_timer(&dev->fw_dl_timer);
-	dev->fw_dl_timer.data = (unsigned long)dev;
-	dev->fw_dl_timer.function = at76_fw_dl_timeout;
-
-	spin_lock_init(&dev->mgmt_spinlock);
-	dev->next_mgmt_bulk = NULL;
-	dev->istate = INTFW_DOWNLOAD;
+	priv = netdev_priv(netdev);
+	memset(priv, 0, sizeof(*priv));
+
+	priv->udev = udev;
+	priv->netdev = netdev;
+
+	init_MUTEX(&priv->sem);
+	INIT_WORK(&priv->work_assoc_done, at76_work_assoc_done);
+	INIT_WORK(&priv->work_external_fw, at76_work_external_fw);
+	INIT_WORK(&priv->work_internal_fw, at76_work_internal_fw);
+	INIT_WORK(&priv->work_join, at76_work_join);
+	INIT_WORK(&priv->work_mgmt_timeout, at76_work_mgmt_timeout);
+	INIT_WORK(&priv->work_new_bss, at76_work_new_bss);
+	INIT_WORK(&priv->work_reset_device, at76_work_reset_device);
+	INIT_WORK(&priv->work_restart, at76_work_restart);
+	INIT_WORK(&priv->work_scan, at76_work_scan);
+	INIT_WORK(&priv->work_set_promisc, at76_work_set_promisc);
+	INIT_WORK(&priv->work_start_ibss, at76_work_start_ibss);
+	INIT_WORK(&priv->work_submit_rx, at76_work_submit_rx);
+
+	priv->open_count = 0;
+
+	init_timer(&priv->restart_timer);
+	priv->restart_timer.data = (unsigned long)priv;
+	priv->restart_timer.function = at76_restart_timeout;
+
+	init_timer(&priv->mgmt_timer);
+	priv->mgmt_timer.data = (unsigned long)priv;
+	priv->mgmt_timer.function = at76_mgmt_timeout;
+
+	init_timer(&priv->fw_dl_timer);
+	priv->fw_dl_timer.data = (unsigned long)priv;
+	priv->fw_dl_timer.function = at76_fw_dl_timeout;
+
+	spin_lock_init(&priv->mgmt_spinlock);
+	priv->next_mgmt_bulk = NULL;
+	priv->istate = INTFW_DOWNLOAD;
 
 	/* initialize empty BSS list */
-	dev->curr_bss = dev->new_bss = NULL;
-	INIT_LIST_HEAD(&dev->bss_list);
-	spin_lock_init(&dev->bss_list_spinlock);
+	priv->curr_bss = priv->new_bss = NULL;
+	INIT_LIST_HEAD(&priv->bss_list);
+	spin_lock_init(&priv->bss_list_spinlock);
 
-	init_timer(&dev->bss_list_timer);
-	dev->bss_list_timer.data = (unsigned long)dev;
-	dev->bss_list_timer.function = at76_bss_list_timeout;
+	init_timer(&priv->bss_list_timer);
+	priv->bss_list_timer.data = (unsigned long)priv;
+	priv->bss_list_timer.function = at76_bss_list_timeout;
 
-	spin_lock_init(&dev->spy_spinlock);
+	spin_lock_init(&priv->spy_spinlock);
 
 	/* mark all rx data entries as unused */
 	for (i = 0; i < NR_RX_DATA_BUF; i++)
-		dev->rx_data[i].skb = NULL;
+		priv->rx_data[i].skb = NULL;
 
-	dev->tasklet.func = at76_rx_tasklet;
-	dev->tasklet.data = (unsigned long)dev;
+	priv->tasklet.func = at76_rx_tasklet;
+	priv->tasklet.data = (unsigned long)priv;
 
-	dev->board_type = board_type;
+	priv->board_type = board_type;
 
-	dev->pm_mode = AT76_PM_OFF;
-	dev->pm_period = 0;
+	priv->pm_mode = AT76_PM_OFF;
+	priv->pm_period = 0;
 
-	return dev;
+	return priv;
 }
 
 
 /* Parse the firmware image */
-static int at76_parse_fw(struct at76_priv *dev, u8 *fw_data, int fw_size,
+static int at76_parse_fw(struct at76_priv *priv, u8 *fw_data, int fw_size,
 			 int board_type)
 {
 	char *str;
@@ -6169,28 +6169,28 @@ static int at76_parse_fw(struct at76_priv *dev, u8 *fw_data, int fw_size,
 	}
 
 	/* CRC currently not checked */
-	dev->board_type = le32_to_cpu(fw->board_type);
-	dev->fw_version.major = fw->major;
-	dev->fw_version.minor = fw->minor;
-	dev->fw_version.patch = fw->patch;
-	dev->fw_version.build = fw->build;
+	priv->board_type = le32_to_cpu(fw->board_type);
+	priv->fw_version.major = fw->major;
+	priv->fw_version.minor = fw->minor;
+	priv->fw_version.patch = fw->patch;
+	priv->fw_version.build = fw->build;
 	str = (char *)fw_data + le32_to_cpu(fw->str_offset);
-	dev->intfw = (u8 *)fw + le32_to_cpu(fw->int_fw_offset);
-	dev->intfw_size = le32_to_cpu(fw->int_fw_len);
-	dev->extfw = (u8 *)fw + le32_to_cpu(fw->ext_fw_offset);
-	dev->extfw_size = le32_to_cpu(fw->ext_fw_len);
+	priv->intfw = (u8 *)fw + le32_to_cpu(fw->int_fw_offset);
+	priv->intfw_size = le32_to_cpu(fw->int_fw_len);
+	priv->extfw = (u8 *)fw + le32_to_cpu(fw->ext_fw_offset);
+	priv->extfw_size = le32_to_cpu(fw->ext_fw_len);
 
 	at76_dbg(DBG_DEVSTART, "firmware board %u version %u.%u.%u#%u "
-		 "(int %x:%tx, ext %x:%tx)", dev->board_type,
-		 dev->fw_version.major, dev->fw_version.minor,
-		 dev->fw_version.patch, dev->fw_version.build,
-		 dev->intfw_size, dev->intfw - fw_data,
-		 dev->extfw_size, dev->extfw - fw_data);
+		 "(int %x:%tx, ext %x:%tx)", priv->board_type,
+		 priv->fw_version.major, priv->fw_version.minor,
+		 priv->fw_version.patch, priv->fw_version.build,
+		 priv->intfw_size, priv->intfw - fw_data,
+		 priv->extfw_size, priv->extfw - fw_data);
 	at76_dbg(DBG_DEVSTART, "firmware id %s", str);
 
-	if (dev->board_type != board_type) {
+	if (priv->board_type != board_type) {
 		err("inconsistent board types %u != %u", board_type,
-		    dev->board_type);
+		    priv->board_type);
 		return -EINVAL;
 	}
 
@@ -6202,7 +6202,7 @@ static int at76_probe(struct usb_interface *interface,
 		      const struct usb_device_id *id)
 {
 	int ret;
-	struct at76_priv *dev;
+	struct at76_priv *priv;
 	int board_type = (int)id->driver_info;
 	const char *const fw_name = firmwares[board_type].fwname;
 	const struct firmware *fw = firmwares[board_type].fw;
@@ -6225,15 +6225,15 @@ static int at76_probe(struct usb_interface *interface,
 
 	usb_get_dev(udev);
 
-	if ((dev = at76_alloc_new_device(udev, (u8) board_type)) == NULL) {
+	if ((priv = at76_alloc_new_device(udev, (u8) board_type)) == NULL) {
 		ret = -ENOMEM;
 		goto error_alloc;
 	}
 
 	op_mode = at76_get_op_mode(udev);
 
-	usb_set_intfdata(interface, dev);
-	dev->interface = interface;
+	usb_set_intfdata(interface, priv);
+	priv->interface = interface;
 
 	at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);
 
@@ -6248,7 +6248,7 @@ static int at76_probe(struct usb_interface *interface,
 	}
 
 	/* parse the firmware */
-	ret = at76_parse_fw(dev, fw->data, fw->size, board_type);
+	ret = at76_parse_fw(priv, fw->data, fw->size, board_type);
 	if (ret)
 		goto error;
 
@@ -6256,8 +6256,8 @@ static int at76_probe(struct usb_interface *interface,
 	    && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
 		/* download internal firmware part */
 		at76_dbg(DBG_DEVSTART, "downloading internal firmware");
-		dev->istate = INTFW_DOWNLOAD;
-		schedule_work(&dev->work_internal_fw);
+		priv->istate = INTFW_DOWNLOAD;
+		schedule_work(&priv->work_internal_fw);
 	} else {
 		/* Internal firmware already inside the device.  Get firmware
 		 * version to test if external firmware is loaded.
@@ -6268,21 +6268,21 @@ static int at76_probe(struct usb_interface *interface,
 
 		/* if version >= 0.100.x.y or device with built-in flash we can
 		 * query the device for the fw version */
-		if ((dev->fw_version.major > 0 || dev->fw_version.minor >= 100)
+		if ((priv->fw_version.major > 0 || priv->fw_version.minor >= 100)
 		    || (op_mode == OPMODE_NORMAL_NIC_WITH_FLASH)) {
 			ret = at76_get_mib(udev, MIB_FW_VERSION,
-					   &dev->fw_version,
-					   sizeof(dev->fw_version));
+					   &priv->fw_version,
+					   sizeof(priv->fw_version));
 		} else {
 			/* force fw download only if the device has no flash inside */
 			force_fw_dwl = 1;
 		}
 
 		if ((force_fw_dwl) || (ret < 0)
-		    || ((dev->fw_version.major == 0)
-			&& (dev->fw_version.minor == 0)
-			&& (dev->fw_version.patch == 0)
-			&& (dev->fw_version.build == 0))) {
+		    || ((priv->fw_version.major == 0)
+			&& (priv->fw_version.minor == 0)
+			&& (priv->fw_version.patch == 0)
+			&& (priv->fw_version.build == 0))) {
 			if (force_fw_dwl)
 				at76_dbg(DBG_DEVSTART,
 					 "forced download of external firmware part");
@@ -6291,18 +6291,18 @@ static int at76_probe(struct usb_interface *interface,
 					 "cannot get firmware (ret %d) or all zeros "
 					 "- download external firmware", ret);
 
-			dev->istate = EXTFW_DOWNLOAD;
-			schedule_work(&dev->work_external_fw);
+			priv->istate = EXTFW_DOWNLOAD;
+			schedule_work(&priv->work_external_fw);
 		} else {
-			dev->istate = INIT;
-			if ((ret = at76_init_new_device(dev)) < 0)
+			priv->istate = INIT;
+			if ((ret = at76_init_new_device(priv)) < 0)
 				goto error;
 		}
 	}
 	return 0;
 
       error:
-	at76_delete_device(dev);
+	at76_delete_device(priv);
       error_alloc:
 	usb_put_dev(udev);
 	return ret;
diff --git a/at76_usb.h b/at76_usb.h
index 97f46d6..f32bb61 100644
--- a/at76_usb.h
+++ b/at76_usb.h
@@ -433,7 +433,7 @@ struct bss_info {
 	u8 noise_level;
 
 	unsigned long last_rx;	/* time (jiffies) of last beacon received */
-	u16 assoc_id;		/* if this is dev->curr_bss this is the assoc id we got
+	u16 assoc_id;		/* if this is priv->curr_bss this is the assoc id we got
 				   in a successful AssocResponse */
 };
 
@@ -525,9 +525,9 @@ struct at76_priv {
 						   before and must not remove curr_bss nor
 						   new_bss ! */
 	struct bss_info *curr_bss;	/* if istate == AUTH, ASSOC, REASSOC, JOIN or CONN 
-					   dev->bss[curr_bss] is the currently selected BSS
+					   priv->bss[curr_bss] is the currently selected BSS
 					   we operate on */
-	struct bss_info *new_bss;	/* if istate == REASSOC dev->new_bss
+	struct bss_info *new_bss;	/* if istate == REASSOC priv->new_bss
 					   is the new bss we want to reassoc to */
 
 	u8 wanted_bssid[ETH_ALEN];