From patchwork Thu Jul 22 11:58:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 113577 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 o6MBwvCT020024 for ; Thu, 22 Jul 2010 11:58:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753523Ab0GVL64 (ORCPT ); Thu, 22 Jul 2010 07:58:56 -0400 Received: from he.sipsolutions.net ([78.46.109.217]:55832 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765Ab0GVL6z (ORCPT ); Thu, 22 Jul 2010 07:58:55 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1ObuPs-00063x-90; Thu, 22 Jul 2010 13:58:20 +0200 Subject: [PATCH] mac80211: remove bogus rcu_read_lock() From: Johannes Berg To: John Linville Cc: linux-wireless Date: Thu, 22 Jul 2010 13:58:51 +0200 Message-ID: <1279799931.12439.14.camel@jlt3.sipsolutions.net> Mime-Version: 1.0 X-Mailer: Evolution 2.30.2 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]); Thu, 22 Jul 2010 11:58:58 +0000 (UTC) --- wireless-testing.orig/net/mac80211/cfg.c 2010-07-22 12:24:38.000000000 +0200 +++ wireless-testing/net/mac80211/cfg.c 2010-07-22 13:56:19.000000000 +0200 @@ -324,15 +324,10 @@ static int ieee80211_config_default_mgmt struct net_device *dev, u8 key_idx) { - struct ieee80211_sub_if_data *sdata; + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); - rcu_read_lock(); - - sdata = IEEE80211_DEV_TO_SUB_IF(dev); ieee80211_set_default_mgmt_key(sdata, key_idx); - rcu_read_unlock(); - return 0; }