diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2008-01-16 09:52:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:10:05 -0500 |
commit | 4365929d176b47a78d10aca0d1dee2afdfcbe4f2 (patch) | |
tree | 04a02753b4633beb790068b85810a5c1b2ad0041 /drivers | |
parent | ae3e0fcf901e4b7df87aef7ab39093e142a8de8b (diff) |
libertas: move cardspecific data to driver
boot2_version is purely USB specific, so move it to struct if_usb_card.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/libertas/dev.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index 362975189e92..c1c9733c5f9e 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h | |||
@@ -102,7 +102,6 @@ struct lbs_private { | |||
102 | int mesh_open; | 102 | int mesh_open; |
103 | int infra_open; | 103 | int infra_open; |
104 | int mesh_autostart_enabled; | 104 | int mesh_autostart_enabled; |
105 | __le16 boot2_version; | ||
106 | 105 | ||
107 | char name[DEV_NAME_LEN]; | 106 | char name[DEV_NAME_LEN]; |
108 | 107 | ||
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 7db8e6c35dc2..75aed9d07367 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
@@ -104,12 +104,13 @@ static void if_usb_free(struct if_usb_card *cardp) | |||
104 | 104 | ||
105 | static void if_usb_setup_firmware(struct lbs_private *priv) | 105 | static void if_usb_setup_firmware(struct lbs_private *priv) |
106 | { | 106 | { |
107 | struct if_usb_card *cardp = priv->card; | ||
107 | struct cmd_ds_set_boot2_ver b2_cmd; | 108 | struct cmd_ds_set_boot2_ver b2_cmd; |
108 | struct cmd_ds_802_11_fw_wake_method wake_method; | 109 | struct cmd_ds_802_11_fw_wake_method wake_method; |
109 | 110 | ||
110 | b2_cmd.hdr.size = cpu_to_le16(sizeof(b2_cmd)); | 111 | b2_cmd.hdr.size = cpu_to_le16(sizeof(b2_cmd)); |
111 | b2_cmd.action = 0; | 112 | b2_cmd.action = 0; |
112 | b2_cmd.version = priv->boot2_version; | 113 | b2_cmd.version = cardp->boot2_version; |
113 | 114 | ||
114 | if (lbs_cmd_with_response(priv, CMD_SET_BOOT2_VER, &b2_cmd)) | 115 | if (lbs_cmd_with_response(priv, CMD_SET_BOOT2_VER, &b2_cmd)) |
115 | lbs_deb_usb("Setting boot2 version failed\n"); | 116 | lbs_deb_usb("Setting boot2 version failed\n"); |
@@ -234,7 +235,7 @@ static int if_usb_probe(struct usb_interface *intf, | |||
234 | priv->hw_host_to_card = if_usb_host_to_card; | 235 | priv->hw_host_to_card = if_usb_host_to_card; |
235 | priv->hw_get_int_status = if_usb_get_int_status; | 236 | priv->hw_get_int_status = if_usb_get_int_status; |
236 | priv->hw_read_event_cause = if_usb_read_event_cause; | 237 | priv->hw_read_event_cause = if_usb_read_event_cause; |
237 | priv->boot2_version = udev->descriptor.bcdDevice; | 238 | cardp->boot2_version = udev->descriptor.bcdDevice; |
238 | 239 | ||
239 | if_usb_submit_rx_urb(cardp); | 240 | if_usb_submit_rx_urb(cardp); |
240 | 241 | ||
diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h index 77066911230b..e4829a391eb9 100644 --- a/drivers/net/wireless/libertas/if_usb.h +++ b/drivers/net/wireless/libertas/if_usb.h | |||
@@ -70,6 +70,7 @@ struct if_usb_card { | |||
70 | uint8_t fwfinalblk; | 70 | uint8_t fwfinalblk; |
71 | uint8_t surprise_removed; | 71 | uint8_t surprise_removed; |
72 | 72 | ||
73 | __le16 boot2_version; | ||
73 | }; | 74 | }; |
74 | 75 | ||
75 | /** fwheader */ | 76 | /** fwheader */ |