[PATCH] [UBUNTU:ipw2200] Merge with upstream 1.0.10

[crimsun at fungus.sh.nu]

Attached is git-format-patch output bringing Dapper's 2.6.15-12.17 in
line with ipw2200's upstream 1.0.10 release that fixes two issues, one
regarding QoS command sends in 1.0.9 and another regarding referencing
a previously kfree()d variable.

Thanks,
-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
Subject: [PATCH] [UBUNTU:ipw2200] Merge with upstream 1.0.10

UpstreamStatus: Committed

Reference: http://ipw2200.sourceforge.net/

Merge changes from upstream 1.0.10, includes Henrik Brix Andersen's
fixes for QoS command sending with ipw_send_cmd_pdu() in 1.0.9 and a
fix for a previously kfree()d variable reference.

Signed-off-by: Daniel T Chen <crimsun at fungus.sh.nu>

---

 drivers/net/wireless/ipw2200.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

bf6fa35633b3b1764e28f1b26e2097c4e2f049f8
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 54622ba..50ad3f8 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -32,7 +32,7 @@
 
 #include "ipw2200.h"
 
-#define IPW2200_VERSION "1.0.9"
+#define IPW2200_VERSION "1.0.10"
 #define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 2200/2915 Network Driver"
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2005 Intel Corporation"
 #define DRV_VERSION     IPW2200_VERSION
@@ -7586,15 +7586,15 @@ static int ipw_handle_assoc_response(str
 static int ipw_send_qos_params_command(struct ipw_priv *priv, struct ieee80211_qos_parameters
 				       *qos_param)
 {
-	return ipw_send_cmd_pdu(priv, IPW_CMD_QOS_PARAMETERS, qos_param,
-				sizeof(*qos_param) * 3);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_QOS_PARAMETERS,
+				sizeof(*qos_param) * 3, qos_param);
 }
 
 static int ipw_send_qos_info_command(struct ipw_priv *priv, struct ieee80211_qos_information_element
 				     *qos_param)
 {
-	return ipw_send_cmd_pdu(priv, IPW_CMD_WME_INFO, qos_param,
-				sizeof(*qos_param));
+	return ipw_send_cmd_pdu(priv, IPW_CMD_WME_INFO, sizeof(*qos_param),
+				qos_param);
 }
 
 #endif				/* CONFIG_IPW_QOS */
@@ -11757,8 +11757,8 @@ static void ipw_pci_remove(struct pci_de
 	/* Free MAC hash list for ADHOC */
 	for (i = 0; i < IPW_IBSS_MAC_HASH_SIZE; i++) {
 		list_for_each_safe(p, q, &priv->ibss_mac_hash[i]) {
-			kfree(list_entry(p, struct ipw_ibss_seq, list));
 			list_del(p);
+			kfree(list_entry(p, struct ipw_ibss_seq, list));
 		}
 	}
 
-- 
1.0.5
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060113/408ab84c/attachment.sig>