From c322a3d5af3e2059b684c46dfa21abffc5a9b9f8 Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Fri, 6 Jan 2012 00:05:51 +0200 Subject: [PATCH] --- yaml --- r: 300935 b: refs/heads/master c: ba421f8f9266a5dda86fb8ce7b814336ae1edadc h: refs/heads/master i: 300933: a0ddf5bd9d795eafc0fc32cd816f379e63ddf16f 300931: ec3eec8022300f28a4c5fe2025043628e680930a 300927: 4996065920e980383a6c8f83ee460eb51083a1b8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d50d5d1a9d4..7dd7d6260a38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a589a6f38cbde9500f8b5c350b0a03ca2b3fef0 +refs/heads/master: ba421f8f9266a5dda86fb8ce7b814336ae1edadc diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c index ef0d04ed9f15..730bbb1ad95b 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/main.c +++ b/trunk/drivers/net/wireless/ti/wlcore/main.c @@ -4740,7 +4740,7 @@ static int wl1271_init_ieee80211(struct wl1271 *wl) wl->hw->sta_data_size = sizeof(struct wl1271_station); wl->hw->vif_data_size = sizeof(struct wl12xx_vif); - wl->hw->max_rx_aggregation_subframes = 8; + wl->hw->max_rx_aggregation_subframes = wl->conf.ht.rx_ba_win_size; return 0; }