Re: [PATCH] mac80211: make ARP filtering depend on CONFIG_INET

[Juuso Oikarinen <juuso.oikarinen@nokia.com>]

Hi,

On Fri, 2010-06-04 at 20:28 +0200, ext John W. Linville wrote:
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
>  net/mac80211/main.c |    6 ++++++
>  net/mac80211/mlme.c |    2 ++
>  2 files changed, 8 insertions(+), 0 deletions(-)



> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 7e72013..3623bb7 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -2078,6 +2078,7 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
>  			cfg80211_send_assoc_timeout(wk->sdata->dev,
>  						    wk->filter_ta);
>  			return WORK_DONE_DESTROY;
> +#ifdef CONFIG_INET
>  		} else {
>  			mutex_unlock(&wk->sdata->u.mgd.mtx);
>  
> @@ -2088,6 +2089,7 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
>  			rtnl_lock();
>  			ieee80211_set_arp_filter(wk->sdata);
>  			rtnl_unlock();
> +#endif
>  		}

Here, if CONFIG_INET is not set, and the previous condition is not true,
the mutex will not be unlocked.

The arp-filter code here is causing some locking issues, so I'll need to
move it elsewhere anyway. I can also fix the unlocking while at it.

-Juuso

>  	}
>