From patchwork Sat Jul 17 13:59:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 112562 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6HDxEYD006907 for ; Sat, 17 Jul 2010 13:59:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755945Ab0GQN7N (ORCPT ); Sat, 17 Jul 2010 09:59:13 -0400 Received: from nbd.name ([88.198.39.176]:35797 "EHLO ds10.nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754934Ab0GQN7M (ORCPT ); Sat, 17 Jul 2010 09:59:12 -0400 Message-ID: <4C41B72B.8020306@openwrt.org> Date: Sat, 17 Jul 2010 15:59:07 +0200 From: Felix Fietkau User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.10) Gecko/20100512 Thunderbird/3.0.5 MIME-Version: 1.0 To: linux-wireless CC: Johannes Berg , "John W. Linville" Subject: [PATCH] mac80211: fix aggregation action frame handling with AP VLANs X-Enigmail-Version: 1.0.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 17 Jul 2010 13:59:14 +0000 (UTC) --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -756,7 +756,7 @@ static void ieee80211_iface_work(struct int len = skb->len; mutex_lock(&local->sta_mtx); - sta = sta_info_get(sdata, mgmt->sa); + sta = sta_info_get_bss(sdata, mgmt->sa); if (sta) { switch (mgmt->u.action.u.addba_req.action_code) { case WLAN_ACTION_ADDBA_REQ: @@ -797,7 +797,7 @@ static void ieee80211_iface_work(struct * right, so terminate the session. */ mutex_lock(&local->sta_mtx); - sta = sta_info_get(sdata, mgmt->sa); + sta = sta_info_get_bss(sdata, mgmt->sa); if (sta) { u16 tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;