From patchwork Sat Aug 28 15:41:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 139981 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 o7SFhd1W002629 for ; Sat, 28 Aug 2010 15:44:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752690Ab0H1Plm (ORCPT ); Sat, 28 Aug 2010 11:41:42 -0400 Received: from mgw2.diku.dk ([130.225.96.92]:42079 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752376Ab0H1PlV (ORCPT ); Sat, 28 Aug 2010 11:41:21 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id F185C19BE94; Sat, 28 Aug 2010 17:41:20 +0200 (CEST) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 29477-06; Sat, 28 Aug 2010 17:41:19 +0200 (CEST) Received: from palace.topps.diku.dk (palace.ekstranet.diku.dk [192.38.115.202]) by mgw2.diku.dk (Postfix) with ESMTP id E4EC619BEA8; Sat, 28 Aug 2010 17:41:15 +0200 (CEST) From: Julia Lawall To: "John W. Linville" Cc: kernel-janitors@vger.kernel.org, "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] net/wireless: Remove double test Date: Sat, 28 Aug 2010 17:41:06 +0200 Message-Id: <1283010066-20935-8-git-send-email-julia@diku.dk> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1283010066-20935-1-git-send-email-julia@diku.dk> References: <1283010066-20935-1-git-send-email-julia@diku.dk> 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 (demeter1.kernel.org [140.211.167.41]); Sat, 28 Aug 2010 15:44:20 +0000 (UTC) diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c index 0ef17bc..4038593 100644 --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c @@ -611,7 +611,7 @@ struct iw_statistics *get_wireless_stats(struct net_device *dev) #endif #ifdef CONFIG_CFG80211_WEXT - if (dev->ieee80211_ptr && dev->ieee80211_ptr && + if (dev->ieee80211_ptr && dev->ieee80211_ptr->wiphy && dev->ieee80211_ptr->wiphy->wext && dev->ieee80211_ptr->wiphy->wext->get_wireless_stats)