Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4365929d176b47a78d10aca0d1dee2afdfcbe4f2
Commit:     4365929d176b47a78d10aca0d1dee2afdfcbe4f2
Parent:     ae3e0fcf901e4b7df87aef7ab39093e142a8de8b
Author:     Holger Schurig <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 16 15:52:58 2008 +0100
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:10:05 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/dev.h    |    1 -
 drivers/net/wireless/libertas/if_usb.c |    5 +++--
 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 3629751..c1c9733 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -102,7 +102,6 @@ struct lbs_private {
        int mesh_open;
        int infra_open;
        int mesh_autostart_enabled;
-       __le16 boot2_version;
 
        char name[DEV_NAME_LEN];
 
diff --git a/drivers/net/wireless/libertas/if_usb.c 
b/drivers/net/wireless/libertas/if_usb.c
index 7db8e6c..75aed9d 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)
 
 static void if_usb_setup_firmware(struct lbs_private *priv)
 {
+       struct if_usb_card *cardp = priv->card;
        struct cmd_ds_set_boot2_ver b2_cmd;
        struct cmd_ds_802_11_fw_wake_method wake_method;
 
        b2_cmd.hdr.size = cpu_to_le16(sizeof(b2_cmd));
        b2_cmd.action = 0;
-       b2_cmd.version = priv->boot2_version;
+       b2_cmd.version = cardp->boot2_version;
 
        if (lbs_cmd_with_response(priv, CMD_SET_BOOT2_VER, &b2_cmd))
                lbs_deb_usb("Setting boot2 version failed\n");
@@ -234,7 +235,7 @@ static int if_usb_probe(struct usb_interface *intf,
        priv->hw_host_to_card = if_usb_host_to_card;
        priv->hw_get_int_status = if_usb_get_int_status;
        priv->hw_read_event_cause = if_usb_read_event_cause;
-       priv->boot2_version = udev->descriptor.bcdDevice;
+       cardp->boot2_version = udev->descriptor.bcdDevice;
 
        if_usb_submit_rx_urb(cardp);
 
diff --git a/drivers/net/wireless/libertas/if_usb.h 
b/drivers/net/wireless/libertas/if_usb.h
index 7706691..e4829a3 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 {
        uint8_t fwfinalblk;
        uint8_t surprise_removed;
 
+       __le16 boot2_version;
 };
 
 /** fwheader */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to