From 9077260277e4cd12dd2db4958d85f423022e9624 Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Mon, 18 Apr 2011 14:15:26 +0300
Subject: [PATCH] --- yaml --- r: 247515 b: refs/heads/master c:
 c45a85b5a3c0ca841a7ffc700bdece8ee01486be h: refs/heads/master i:   247513:
 209c40723d63f5aa124b038ff689a871f62a21bb   247511:
 3eb9abda087b6063ed1320eee0c04f94c291f968 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl12xx/init.c | 7 ++++++-
 trunk/drivers/net/wireless/wl12xx/init.h | 1 +
 trunk/drivers/net/wireless/wl12xx/main.c | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2061f39434e2..cb58de1b55e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70f474241b3d5fb633635a2ce39ea9da4afeea6c
+refs/heads/master: c45a85b5a3c0ca841a7ffc700bdece8ee01486be
diff --git a/trunk/drivers/net/wireless/wl12xx/init.c b/trunk/drivers/net/wireless/wl12xx/init.c
index 5d0ecd2018bf..b1242a6de27b 100644
--- a/trunk/drivers/net/wireless/wl12xx/init.c
+++ b/trunk/drivers/net/wireless/wl12xx/init.c
@@ -443,7 +443,7 @@ static int wl1271_ap_hw_init(struct wl1271 *wl)
 	return 0;
 }
 
-static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl)
+int wl1271_ap_init_templates(struct wl1271 *wl)
 {
 	int ret;
 
@@ -470,6 +470,11 @@ static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl)
 	return 0;
 }
 
+static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl)
+{
+	return wl1271_ap_init_templates(wl);
+}
+
 int wl1271_init_ap_rates(struct wl1271 *wl)
 {
 	int i, ret;
diff --git a/trunk/drivers/net/wireless/wl12xx/init.h b/trunk/drivers/net/wireless/wl12xx/init.h
index 0dd2414a30d1..3a3c230fd292 100644
--- a/trunk/drivers/net/wireless/wl12xx/init.h
+++ b/trunk/drivers/net/wireless/wl12xx/init.h
@@ -34,5 +34,6 @@ int wl1271_init_energy_detection(struct wl1271 *wl);
 int wl1271_chip_specific_init(struct wl1271 *wl);
 int wl1271_hw_init(struct wl1271 *wl);
 int wl1271_init_ap_rates(struct wl1271 *wl);
+int wl1271_ap_init_templates(struct wl1271 *wl);
 
 #endif
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index e9d4cf48ba35..433bc035741a 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -2503,6 +2503,10 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,
 			wl1271_error("AP rate policy change failed %d", ret);
 			goto out;
 		}
+
+		ret = wl1271_ap_init_templates(wl);
+		if (ret < 0)
+			goto out;
 	}
 
 	ret = wl1271_bss_beacon_info_changed(wl, vif, bss_conf, changed);