From patchwork Thu Mar 3 18:39:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 606911 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 p23Imj2h021009 for ; Thu, 3 Mar 2011 18:49:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932173Ab1CCSsY (ORCPT ); Thu, 3 Mar 2011 13:48:24 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:35605 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758451Ab1CCSsX (ORCPT ); Thu, 3 Mar 2011 13:48:23 -0500 Received: by mail-wy0-f174.google.com with SMTP id 36so1356532wyg.19 for ; Thu, 03 Mar 2011 10:48:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; bh=Ef86f0xsJOehhv2KUf7r8/Pnlx7lVVFCzX9DrTat+iA=; b=S4YGo4fYsqvFVc3JoYhokD2ncKymx+Nr5cTkQnKL+3u5t72J/bVZGnaQikC60xKdg3 N+4Fe9G2INxntySNvEt5WBgboPBRwA9HQ25/U9YwwxsTjb68mZE3ULXK+VL1qo6/rBne NxE4ZaQadsJb/drFrV1NjAsgWdr30fGwKNx34= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=JWmpd5egIr7we8iRwT0TsxlWgwRx+/vryPfK+fb4cQVo9ktkotDZ4YhgQNaM0ns+aC LhHgMLlfuXorSCjATEbD87muTPOplcWWJ8yq0DhigshXXCkgL1OuBK3k8fo/+0GJOpIj mM+RN+x6HVxxE5qiqE72wfjmrZzX0dGlc0vUo= Received: by 10.216.7.205 with SMTP id 55mr901465wep.96.1299178102853; Thu, 03 Mar 2011 10:48:22 -0800 (PST) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id j49sm738659wer.14.2011.03.03.10.48.17 (version=SSLv3 cipher=OTHER); Thu, 03 Mar 2011 10:48:22 -0800 (PST) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 03/19] rt2x00: Remove useless NULL check Date: Thu, 3 Mar 2011 19:39:56 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <201103031938.56423.IvDoorn@gmail.com> <201103031939.28091.IvDoorn@gmail.com> In-Reply-To: <201103031939.28091.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201103031939.57117.IvDoorn@gmail.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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 03 Mar 2011 18:49:18 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index bf9bba3..b32ca31 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -221,8 +221,7 @@ static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry, struct rt2x00_intf *intf = vif_to_intf(tx_info->control.vif); unsigned long irqflags; - if (!(tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) || - unlikely(!tx_info->control.vif)) + if (!(tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)) return; /*