From cffece3d7df5c72cfcc7d065ed7f7518eab7592a Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Wed, 9 Nov 2011 13:12:45 +0200
Subject: [PATCH] --- yaml --- r: 278725 b: refs/heads/master c:
 97127e67218e5970a5a7df0513ded730b19a67e9 h: refs/heads/master i:   278723:
 f653d6921305abf7aad1473da3d40529c4d7f547 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/wl12xx/init.c         | 6 +++---
 trunk/drivers/net/wireless/wl12xx/wl12xx_80211.h | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d9d2699f12b8..6ea4d43f5d06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c1b190b10972be9c0d53c658e537c54de530b7f
+refs/heads/master: 97127e67218e5970a5a7df0513ded730b19a67e9
diff --git a/trunk/drivers/net/wireless/wl12xx/init.c b/trunk/drivers/net/wireless/wl12xx/init.c
index c413abd26d1c..88891cdfdd4a 100644
--- a/trunk/drivers/net/wireless/wl12xx/init.c
+++ b/trunk/drivers/net/wireless/wl12xx/init.c
@@ -65,7 +65,7 @@ int wl1271_init_templates_config(struct wl1271 *wl)
 
 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, NULL,
 				      sizeof
-				      (struct wl12xx_qos_null_data_template),
+				      (struct ieee80211_qos_hdr),
 				      0, WL1271_RATE_AUTOMATIC);
 	if (ret < 0)
 		return ret;
@@ -114,8 +114,8 @@ int wl1271_init_templates_config(struct wl1271 *wl)
 
 	for (i = 0; i < CMD_TEMPL_KLV_IDX_MAX; i++) {
 		ret = wl1271_cmd_template_set(wl, CMD_TEMPL_KLV, NULL,
-					      WL1271_CMD_TEMPL_DFLT_SIZE, i,
-					      WL1271_RATE_AUTOMATIC);
+					      sizeof(struct ieee80211_qos_hdr),
+					      i, WL1271_RATE_AUTOMATIC);
 		if (ret < 0)
 			return ret;
 	}
diff --git a/trunk/drivers/net/wireless/wl12xx/wl12xx_80211.h b/trunk/drivers/net/wireless/wl12xx/wl12xx_80211.h
index f7971d3b0898..8f0ffaf62309 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/trunk/drivers/net/wireless/wl12xx/wl12xx_80211.h
@@ -116,11 +116,6 @@ struct wl12xx_ps_poll_template {
 	u8 ta[ETH_ALEN];
 } __packed;
 
-struct wl12xx_qos_null_data_template {
-	struct ieee80211_header header;
-	__le16 qos_ctl;
-} __packed;
-
 struct wl12xx_arp_rsp_template {
 	struct ieee80211_hdr_3addr hdr;