diff options
author | Luciano Coelho <coelho@ti.com> | 2011-12-13 08:45:54 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-12-15 02:58:42 -0500 |
commit | 36b2082434e956e6048a26bbf4c14ad7488db153 (patch) | |
tree | 9135d5d8dd12f9b78b2b617f59bf0dfe144c2daf /drivers/net | |
parent | 5de8eef4fdd2044f6981ebf62330720bcdba8ee3 (diff) |
wl12xx: remove deprecated packet detection threshold config
The ACX_PD_THRESHOLD configuration command is deprecated and should
not be used anymore.
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/wl12xx/acx.c | 26 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/acx.h | 8 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/init.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/init.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 5 |
5 files changed, 0 insertions, 56 deletions
diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c index bde1d862bdd5..7537c401a448 100644 --- a/drivers/net/wireless/wl12xx/acx.c +++ b/drivers/net/wireless/wl12xx/acx.c | |||
@@ -186,32 +186,6 @@ out: | |||
186 | return ret; | 186 | return ret; |
187 | } | 187 | } |
188 | 188 | ||
189 | int wl1271_acx_pd_threshold(struct wl1271 *wl) | ||
190 | { | ||
191 | struct acx_packet_detection *pd; | ||
192 | int ret; | ||
193 | |||
194 | wl1271_debug(DEBUG_ACX, "acx data pd threshold"); | ||
195 | |||
196 | pd = kzalloc(sizeof(*pd), GFP_KERNEL); | ||
197 | if (!pd) { | ||
198 | ret = -ENOMEM; | ||
199 | goto out; | ||
200 | } | ||
201 | |||
202 | pd->threshold = cpu_to_le32(wl->conf.rx.packet_detection_threshold); | ||
203 | |||
204 | ret = wl1271_cmd_configure(wl, ACX_PD_THRESHOLD, pd, sizeof(*pd)); | ||
205 | if (ret < 0) { | ||
206 | wl1271_warning("failed to set pd threshold: %d", ret); | ||
207 | goto out; | ||
208 | } | ||
209 | |||
210 | out: | ||
211 | kfree(pd); | ||
212 | return ret; | ||
213 | } | ||
214 | |||
215 | int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif, | 189 | int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif, |
216 | enum acx_slot_type slot_time) | 190 | enum acx_slot_type slot_time) |
217 | { | 191 | { |
diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h index b2d85bea6378..69892b40c2df 100644 --- a/drivers/net/wireless/wl12xx/acx.h +++ b/drivers/net/wireless/wl12xx/acx.h | |||
@@ -171,13 +171,6 @@ struct acx_rx_msdu_lifetime { | |||
171 | __le32 lifetime; | 171 | __le32 lifetime; |
172 | } __packed; | 172 | } __packed; |
173 | 173 | ||
174 | struct acx_packet_detection { | ||
175 | struct acx_header header; | ||
176 | |||
177 | __le32 threshold; | ||
178 | } __packed; | ||
179 | |||
180 | |||
181 | enum acx_slot_type { | 174 | enum acx_slot_type { |
182 | SLOT_TIME_LONG = 0, | 175 | SLOT_TIME_LONG = 0, |
183 | SLOT_TIME_SHORT = 1, | 176 | SLOT_TIME_SHORT = 1, |
@@ -1238,7 +1231,6 @@ int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif); | |||
1238 | int wl1271_acx_mem_map(struct wl1271 *wl, | 1231 | int wl1271_acx_mem_map(struct wl1271 *wl, |
1239 | struct acx_header *mem_map, size_t len); | 1232 | struct acx_header *mem_map, size_t len); |
1240 | int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl); | 1233 | int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl); |
1241 | int wl1271_acx_pd_threshold(struct wl1271 *wl); | ||
1242 | int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif, | 1234 | int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif, |
1243 | enum acx_slot_type slot_time); | 1235 | enum acx_slot_type slot_time); |
1244 | int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif, | 1236 | int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif, |
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c index 76625145e32e..ca7ee59e4505 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/wl12xx/init.c | |||
@@ -223,17 +223,6 @@ static int wl12xx_init_rx_config(struct wl1271 *wl) | |||
223 | return 0; | 223 | return 0; |
224 | } | 224 | } |
225 | 225 | ||
226 | int wl1271_init_phy_config(struct wl1271 *wl) | ||
227 | { | ||
228 | int ret; | ||
229 | |||
230 | ret = wl1271_acx_pd_threshold(wl); | ||
231 | if (ret < 0) | ||
232 | return ret; | ||
233 | |||
234 | return 0; | ||
235 | } | ||
236 | |||
237 | static int wl12xx_init_phy_vif_config(struct wl1271 *wl, | 226 | static int wl12xx_init_phy_vif_config(struct wl1271 *wl, |
238 | struct wl12xx_vif *wlvif) | 227 | struct wl12xx_vif *wlvif) |
239 | { | 228 | { |
@@ -706,11 +695,6 @@ int wl1271_hw_init(struct wl1271 *wl) | |||
706 | if (ret < 0) | 695 | if (ret < 0) |
707 | goto out_free_memmap; | 696 | goto out_free_memmap; |
708 | 697 | ||
709 | /* PHY layer config */ | ||
710 | ret = wl1271_init_phy_config(wl); | ||
711 | if (ret < 0) | ||
712 | goto out_free_memmap; | ||
713 | |||
714 | ret = wl1271_acx_dco_itrim_params(wl); | 698 | ret = wl1271_acx_dco_itrim_params(wl); |
715 | if (ret < 0) | 699 | if (ret < 0) |
716 | goto out_free_memmap; | 700 | goto out_free_memmap; |
diff --git a/drivers/net/wireless/wl12xx/init.h b/drivers/net/wireless/wl12xx/init.h index 81140b81f654..2da0f404ef6e 100644 --- a/drivers/net/wireless/wl12xx/init.h +++ b/drivers/net/wireless/wl12xx/init.h | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | int wl1271_hw_init_power_auth(struct wl1271 *wl); | 29 | int wl1271_hw_init_power_auth(struct wl1271 *wl); |
30 | int wl1271_init_templates_config(struct wl1271 *wl); | 30 | int wl1271_init_templates_config(struct wl1271 *wl); |
31 | int wl1271_init_phy_config(struct wl1271 *wl); | ||
32 | int wl1271_init_pta(struct wl1271 *wl); | 31 | int wl1271_init_pta(struct wl1271 *wl); |
33 | int wl1271_init_energy_detection(struct wl1271 *wl); | 32 | int wl1271_init_energy_detection(struct wl1271 *wl); |
34 | int wl1271_chip_specific_init(struct wl1271 *wl); | 33 | int wl1271_chip_specific_init(struct wl1271 *wl); |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 333bc294f1d9..ec446710ebb3 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -674,11 +674,6 @@ static int wl1271_plt_init(struct wl1271 *wl) | |||
674 | if (ret < 0) | 674 | if (ret < 0) |
675 | return ret; | 675 | return ret; |
676 | 676 | ||
677 | /* PHY layer config */ | ||
678 | ret = wl1271_init_phy_config(wl); | ||
679 | if (ret < 0) | ||
680 | goto out_free_memmap; | ||
681 | |||
682 | ret = wl12xx_acx_mem_cfg(wl); | 677 | ret = wl12xx_acx_mem_cfg(wl); |
683 | if (ret < 0) | 678 | if (ret < 0) |
684 | goto out_free_memmap; | 679 | goto out_free_memmap; |