From patchwork Tue Feb 12 16:37:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: michael-dev X-Patchwork-Id: 2129891 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4B01FDF23E for ; Tue, 12 Feb 2013 16:37:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758829Ab3BLQh3 (ORCPT ); Tue, 12 Feb 2013 11:37:29 -0500 Received: from gast-001.fem.tu-ilmenau.de ([141.24.44.1]:37064 "EHLO a251.fem.tu-ilmenau.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758571Ab3BLQh3 (ORCPT ); Tue, 12 Feb 2013 11:37:29 -0500 Received: by konsullaptop.a-keller (Postfix, from userid 1000) id 2498F220363; Tue, 12 Feb 2013 17:37:28 +0100 (CET) From: Michael Braun To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, projekt-wlan@fem.tu-ilmenau.de, Michael Braun Subject: [PATCHv2 1/1] mac80211: fix WPA with VLAN on AP side with ps-sta Date: Tue, 12 Feb 2013 17:37:18 +0100 Message-Id: <1360687038-17610-2-git-send-email-michael-dev@fami-braun.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360687038-17610-1-git-send-email-michael-dev@fami-braun.de> References: <1360687038-17610-1-git-send-email-michael-dev@fami-braun.de> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When sending a broadcast while at least on of the connected stations is sleeping, it gets queued and send after a DTIM beacon is sent. If the packet was to be sent on a vlan interface, the vif used for dequeing from the per-bss queue does not hold the per-vlan sdata. The correct sdata is required to use the correct per-vlan broadcast/multicast key. This patch fixes this by restoring the per-vlan sdata using the skb->dev entry. Signed-off-by: Michael Braun V2: fix compile warning --- net/mac80211/tx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 2ef0e19..583c025 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2728,6 +2728,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ps_data *ps; struct ieee80211_tx_info *info; struct ieee80211_chanctx_conf *chanctx_conf; + struct ieee80211_sub_if_data *frame_sdata; sdata = vif_to_sdata(vif); @@ -2770,7 +2771,8 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, cpu_to_le16(IEEE80211_FCTL_MOREDATA); } - if (!ieee80211_tx_prepare(sdata, &tx, skb)) + frame_sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev); + if (!ieee80211_tx_prepare(frame_sdata, &tx, skb)) break; dev_kfree_skb_any(skb); }