wl12xx: init CMD_TEMPL_KLV to sizeof(ieee80211_qos_hdr)

The keep alive template should have a max size of
sizeof(struct ieee80211_qos_hdr).

Additionally, Remove the redundant wl12xx_qos_null_data_template
struct.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c
index c413abd26d1cab5c00ebb4e46da00a1cfb85a460..88891cdfdd4adc7f1bb67e27771e8a959517456a 100644 (file)
--- a/drivers/net/wireless/wl12xx/init.c
+++ b/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/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h
index f7971d3b089856bdd31135aa0e90b4e6d915829a..8f0ffaf62309f8208a1bd6299cf3fd1c66c29e45 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/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;