[PATCH] Remove unused and write-only fields from some structures

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

2 files changed, 0 insertions, 32 deletions

diff --git a/at76_usb.c b/at76_usb.c
index 4f495eb..840d39a 100644
--- a/at76_usb.c
+++ b/at76_usb.c
@@ -666,9 +666,6 @@ static int at76_get_hw_config(struct at76_priv *dev)
 		if (ret < 0)
 			break;
 		memcpy(dev->mac_addr, hwcfg->i.mac_addr, ETH_ALEN);
-		memcpy(dev->cr31_values, hwcfg->i.cr31_values, 14);
-		memcpy(dev->cr58_values, hwcfg->i.cr58_values, 14);
-		memcpy(dev->pidvid, hwcfg->i.pidvid, 4);
 		dev->regulatory_domain = hwcfg->i.regulatory_domain;
 		break;
 
@@ -677,14 +674,8 @@ static int at76_get_hw_config(struct at76_priv *dev)
 		ret = at76_get_hw_cfg_rfmd(dev->udev, hwcfg, sizeof(hwcfg->r3));
 		if (ret < 0)
 			break;
-		memcpy(dev->cr20_values, hwcfg->r3.cr20_values, 14);
-		memcpy(dev->cr21_values, hwcfg->r3.cr21_values, 14);
-		memcpy(dev->bb_cr, hwcfg->r3.bb_cr, 14);
-		memcpy(dev->pidvid, hwcfg->r3.pidvid, 4);
 		memcpy(dev->mac_addr, hwcfg->r3.mac_addr, ETH_ALEN);
 		dev->regulatory_domain = hwcfg->r3.regulatory_domain;
-		memcpy(dev->low_power_values, hwcfg->r3.low_power_values, 14);
-		memcpy(dev->normal_power_values, hwcfg->r3.normal_power_values, 14);
 		break;
 
 	case BOARDTYPE_505_RFMD:
@@ -693,12 +684,8 @@ static int at76_get_hw_config(struct at76_priv *dev)
 		ret = at76_get_hw_cfg_rfmd(dev->udev, hwcfg, sizeof(hwcfg->r5));
 		if (ret < 0)
 			break;
-		memcpy(dev->cr39_values, hwcfg->r5.cr39_values, 14);
-		memcpy(dev->bb_cr, hwcfg->r5.bb_cr, 14);
-		memcpy(dev->pidvid, hwcfg->r5.pidvid, 4);
 		memcpy(dev->mac_addr, hwcfg->r5.mac_addr, ETH_ALEN);
 		dev->regulatory_domain = hwcfg->r5.regulatory_domain;
-		memcpy(dev->cr15_values, hwcfg->r5.cr15_values, 14);
 		break;
 
 	default:
@@ -3032,7 +3019,6 @@ static void at76_rx_mgmt_beacon(struct at76_priv *dev, struct at76_rx_buffer *bu
 	match->rssi = buf->rssi;
 	match->link_qual = buf->link_quality;
 	match->noise_level = buf->noise_level;
-	memcpy(match->mac, mgmt->addr2, ETH_ALEN);	/* just for info */
 	memcpy(match->bssid, mgmt->addr3, ETH_ALEN);
 	at76_dbg(DBG_RX_BEACON, "%s: bssid %s", dev->netdev->name,
 	         mac2str(match->bssid));
@@ -5961,7 +5947,6 @@ static int at76_alloc_urbs(struct at76_priv *dev)
 			}
 			buffer_size = sizeof(struct at76_tx_buffer) +
 			    MAX_PADDING_SIZE;
-			dev->bulk_out_size = buffer_size;
 			dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
 			dev->bulk_out_buffer = kmalloc(buffer_size, GFP_KERNEL);
 			if (!dev->bulk_out_buffer) {
diff --git a/at76_usb.h b/at76_usb.h
index 944e41f..e486bbf 100644
--- a/at76_usb.h
+++ b/at76_usb.h
@@ -426,8 +426,6 @@ struct reg_domain {
 struct bss_info {
 	struct list_head list;
 
-	u8 mac[ETH_ALEN];	/* real mac address, differs 
-				   for ad-hoc from bssid */
 	u8 bssid[ETH_ALEN];	/* bssid */
 	u8 ssid[IW_ESSID_MAX_SIZE + 1];	/* ssid, +1 for trailing \0 
 					   to make it printable */
@@ -476,7 +474,6 @@ struct at76_priv {
 	__u8 bulk_in_endpointAddr;	/* the address of the bulk in endpoint */
 
 	void *bulk_out_buffer;	/* the buffer to send data */
-	int bulk_out_size;	/* the size of the send buffer */
 	struct urb *write_urb;	/* the urb used to send data */
 	struct urb *read_urb;
 	__u8 bulk_out_endpointAddr;	/* the address of the bulk out endpoint */
@@ -495,8 +492,6 @@ struct at76_priv {
 	void *ctrl_buffer;
 	struct urb *ctrl_urb;
 
-	u8 op_mode;
-
 	/* the WEP stuff */
 	int wep_enabled;	/* 1 if WEP is enabled */
 	int wep_key_id;		/* key id to be used */
@@ -506,7 +501,6 @@ struct at76_priv {
 
 	int channel;
 	int iw_mode;
-	int curr_ap;
 	u8 bssid[ETH_ALEN];
 	u8 essid[IW_ESSID_MAX_SIZE];
 	char nickn[IW_ESSID_MAX_SIZE + 1];	/* nickname, only used in the iwconfig i/f */
@@ -561,7 +555,6 @@ struct at76_priv {
 
 	struct timer_list mgmt_timer;	/* the timer we use to repeat auth_req etc. */
 	int retries;		/* counts backwards while re-trying to send auth/assoc_req's */
-	u16 assoc_id;		/* the assoc_id for states JOINING, REASSOCIATING, CONNECTED */
 	u8 pm_mode;		/* power management mode: AT76_PM_{OFF, ON, SMART} */
 	u32 pm_period;		/* power manag. period in us */
 	u32 board_type;		/* BOARDTYPE_* in at76_usb_ids.h */
@@ -577,17 +570,7 @@ struct at76_priv {
 	/* These fields contain HW config provided by the device (not all of
 	 * these fields are used by all board types) */
 	u8 mac_addr[ETH_ALEN];
-	u8 bb_cr[14];
-	u8 pidvid[4];
 	u8 regulatory_domain;
-	u8 cr15_values[14];
-	u8 cr20_values[14];
-	u8 cr21_values[14];
-	u8 cr31_values[14];
-	u8 cr39_values[14];
-	u8 cr58_values[14];
-	u8 low_power_values[14];
-	u8 normal_power_values[14];
 
 	struct at76_card_config card_config;
 	struct mib_fw_version fw_version;