From patchwork Sat Feb 12 13:17:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 551761 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 p1CDIqYm006445 for ; Sat, 12 Feb 2011 13:18:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752157Ab1BLNSv (ORCPT ); Sat, 12 Feb 2011 08:18:51 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:64504 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab1BLNSu (ORCPT ); Sat, 12 Feb 2011 08:18:50 -0500 Received: by bwz15 with SMTP id 15so4072880bwz.19 for ; Sat, 12 Feb 2011 05:18:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=lg8cwPj0trm+vFsmIKxj4Hh/ZiB4upREk6eoyVwkhpk=; b=QP7CrLQGfYFx8zAwKX8psh7ytWjZUK+zNY8lhnsHUSmtf+f7qdzSCbenh+EK6OQ3Uz vaJxUH6iF1eeOy54QKDJvpTCOkNBzV/acNQf/tYoTL9sUlO63dzbmC5klwhhoVk2A9O6 5mF7QzFOi3NGU5vganzXH5eXn7H9qwfWBcRkk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=cBo0iP045mbOc2ak52IikLUhT1RZjeF/g5DN4j8EqZIsBpMhlLKngkLl0vNCSJa330 yS6XvToBPva0aB80b2kUKBHT3cGEYXmSHYQzz9tu7YKW33lhGsAEXofe8HrlQoKLlBac wYO9yztmh9Ih1yr2+STM2d4/JtHSop8FZdRVc= Received: by 10.204.123.5 with SMTP id n5mr1528397bkr.58.1297516729018; Sat, 12 Feb 2011 05:18:49 -0800 (PST) Received: from localhost.localdomain (p5495B96D.dip.t-dialin.net [84.149.185.109]) by mx.google.com with ESMTPS id rc9sm307123bkb.14.2011.02.12.05.18.46 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 12 Feb 2011 05:18:47 -0800 (PST) From: Helmut Schaa To: John W Linville Cc: Johannes Berg , linux-wireless@vger.kernel.org, Helmut Schaa Subject: [PATCH] mac80211: Remove superfluous if clause Date: Sat, 12 Feb 2011 14:17:15 +0100 Message-Id: <1297516635-6892-1-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 1.7.1 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]); Sat, 12 Feb 2011 13:18:52 +0000 (UTC) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 045b2fe..f502634 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -832,18 +832,8 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx) ieee80211_is_pspoll(hdr->frame_control)) && rx->sdata->vif.type != NL80211_IFTYPE_ADHOC && rx->sdata->vif.type != NL80211_IFTYPE_WDS && - (!rx->sta || !test_sta_flags(rx->sta, WLAN_STA_ASSOC)))) { - if ((!ieee80211_has_fromds(hdr->frame_control) && - !ieee80211_has_tods(hdr->frame_control) && - ieee80211_is_data(hdr->frame_control)) || - !(status->rx_flags & IEEE80211_RX_RA_MATCH)) { - /* Drop IBSS frames and frames for other hosts - * silently. */ - return RX_DROP_MONITOR; - } - + (!rx->sta || !test_sta_flags(rx->sta, WLAN_STA_ASSOC)))) return RX_DROP_MONITOR; - } return RX_CONTINUE; }