From patchwork Mon Feb 7 19:03:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 538551 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 p17J40uZ025630 for ; Mon, 7 Feb 2011 19:04:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754180Ab1BGTD5 (ORCPT ); Mon, 7 Feb 2011 14:03:57 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:49083 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752692Ab1BGTD4 (ORCPT ); Mon, 7 Feb 2011 14:03:56 -0500 Received: by fxm20 with SMTP id 20so5219314fxm.19 for ; Mon, 07 Feb 2011 11:03:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=AqgMVROKdjYNGgfrpFh/8/HAsgWon/7CdwySbn978MY=; b=LneOKSOEAC8AmDS3amG6JelXNUOiXGVz9V0DoQLS5wUn0owxYpHpQhyQ+ncFJo+BBn wrGWMCTFAl55jhf0/2hIbGEihE/qpuRPLMu5newRmDSbCkIAEnZwuRpyqqXARuXUkhxH +U9E8GTlhMQeHEFjeLErfCy/XH422jiRlDHrE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=Sw6EWVsoh9UwlGrz8AuupLQ1UUxzFiIKVMw6T5hiUf7PS0EhWgs4MIyQ1onJnoUTju KtStmidMWkJWyYigTQoD6vbGY8G8KclHbMK1oxambOlIcarC709X/wcOowDzqr41VOPn gV1wLFP3av8Moq/YcSYaRWKkwZpYkzktmLfDE= Received: by 10.223.96.78 with SMTP id g14mr7848139fan.15.1297105434191; Mon, 07 Feb 2011 11:03:54 -0800 (PST) Received: from bicker ([212.49.88.34]) by mx.google.com with ESMTPS id n1sm1353586fam.16.2011.02.07.11.03.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 07 Feb 2011 11:03:53 -0800 (PST) Date: Mon, 7 Feb 2011 22:03:35 +0300 From: Dan Carpenter To: Johannes Berg Cc: "John W. Linville" , linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] mac80211: remove unneeded check Message-ID: <20110207190335.GK4384@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 07 Feb 2011 19:04:02 +0000 (UTC) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f305835..ce01bee 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2242,7 +2242,7 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, if (sdata->vif.type == NL80211_IFTYPE_AP) { ap = &sdata->u.ap; beacon = rcu_dereference(ap->beacon); - if (ap && beacon) { + if (beacon) { /* * headroom, head length, * tail length and maximum TIM length