Return-path: Received: from he.sipsolutions.net ([78.46.109.217]:37254 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752348Ab0FHIEE (ORCPT ); Tue, 8 Jun 2010 04:04:04 -0400 Subject: Re: [RFC PATCHv2] mac80211: Fix circular locking dependency in ARP filter handling From: Johannes Berg To: Juuso Oikarinen Cc: linux-wireless@vger.kernel.org, reinette.chatre@intel.com In-Reply-To: <1275978299-18237-1-git-send-email-juuso.oikarinen@nokia.com> References: <1275978299-18237-1-git-send-email-juuso.oikarinen@nokia.com> Content-Type: text/plain; charset="UTF-8" Date: Tue, 08 Jun 2010 10:03:56 +0200 Message-ID: <1275984236.3706.45.camel@jlt3.sipsolutions.net> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tue, 2010-06-08 at 09:24 +0300, Juuso Oikarinen wrote: > @@ -161,10 +161,20 @@ enum ieee80211_bss_change { > BSS_CHANGED_BEACON_ENABLED = 1<<9, > BSS_CHANGED_CQM = 1<<10, > BSS_CHANGED_IBSS = 1<<11, > +#ifdef CONFIG_INET > + BSS_CHANGED_ARP_ADDR_LIST = 1<<12, > +#endif Ick, don't do that, all drivers would end up littered with ifdefs. > @@ -220,6 +235,10 @@ struct ieee80211_bss_conf { > s32 cqm_rssi_thold; > u32 cqm_rssi_hyst; > enum nl80211_channel_type channel_type; > +#ifdef CONFIG_INET > + __be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN]; > + u8 arp_addr_cnt; > +#endifs same here. > @@ -851,6 +851,10 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, > sdata->vif.bss_conf.cqm_rssi_thold) > bss_info_changed |= BSS_CHANGED_CQM; > > +#ifdef CONFIG_INET > + bss_info_changed |= BSS_CHANGED_ARP_ADDR_LIST; > +#endif > + I don't see why you can't set that unconditionally here either, it'll just be an empty list always. Otherwise looks pretty good. johannes