From patchwork Thu Nov 18 08:44:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 335351 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAI8ln1F000413 for ; Thu, 18 Nov 2010 08:47:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755802Ab0KRIrr (ORCPT ); Thu, 18 Nov 2010 03:47:47 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:59917 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755529Ab0KRIrq (ORCPT ); Thu, 18 Nov 2010 03:47:46 -0500 Received: by fxm6 with SMTP id 6so1366500fxm.19 for ; Thu, 18 Nov 2010 00:47:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:mime-version:content-type:content-transfer-encoding :message-id; bh=4BsNVCRGCOmZMIemtVT0UE96aXT3OpNbPC3io5La2iM=; b=Wj7HGTpGgPu8Nhn4XXa+WQc5f9D+VxfnVoM/ZWirHXRCMlymYVl+RGSq/eY/Rd2n4I P6QvQD8GdUpHdf3ytxp8qQijjFBVawMS+zYtPxnZROVow+pcOfw+jHlNyWJUwPt3PyXR EIcVNPXUwGnjKy+KkKgn5TvkwOE9QP2htvOu0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:subject:date:user-agent:mime-version:content-type :content-transfer-encoding:message-id; b=D/oF/w0/9SjHmVjpRyh5pGPmHcePRpVnMKtm5fgjLYmegU+TLKUJjrsZGxsGIBZYS/ IQPYGPlqH/unl9d4gxYsAdgvlC1D48Idyg0QMnCL//Qmh2A/PNUWifptCvIspqg3VccN YA4n7/XaKDPU0i5G5BNmu4KxMPGCScFAYMSUE= Received: by 10.223.93.133 with SMTP id v5mr265449fam.119.1290070065474; Thu, 18 Nov 2010 00:47:45 -0800 (PST) Received: from helmutmobil.site (p5495B17C.dip.t-dialin.net [84.149.177.124]) by mx.google.com with ESMTPS id k21sm33721faa.25.2010.11.18.00.47.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 18 Nov 2010 00:47:44 -0800 (PST) From: Helmut Schaa To: linux-wireless@vger.kernel.org Subject: GTK issues wrt dynamic VLAN tagging with hostapd + mac80211 Date: Thu, 18 Nov 2010 09:44:59 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.36-wl-default+; KDE/4.5.3; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201011180944.59216.helmut.schaa@googlemail.com> 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 (demeter1.kernel.org [140.211.167.41]); Thu, 18 Nov 2010 08:47:50 +0000 (UTC) diff --git a/net/mac80211/key.c b/net/mac80211/key.c index ccd676b..2ddd767 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -85,9 +85,7 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key) sdata = key->sdata; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) - sdata = container_of(sdata->bss, - struct ieee80211_sub_if_data, - u.ap); + goto out_unsupported; ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf); @@ -135,9 +133,7 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) sdata = key->sdata; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) - sdata = container_of(sdata->bss, - struct ieee80211_sub_if_data, - u.ap); + return; ret = drv_set_key(key->local, DISABLE_KEY, sdata, sta, &key->conf);