From patchwork Sun Jul 12 23:12:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 29716 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 05913B7066 for ; Mon, 13 Jul 2009 09:18:13 +1000 (EST) Received: by ozlabs.org (Postfix) id EB3F3DDDFA; Mon, 13 Jul 2009 09:18:12 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 7B0A7DDDA1 for ; Mon, 13 Jul 2009 09:18:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751341AbZGLXLN (ORCPT ); Sun, 12 Jul 2009 19:11:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751037AbZGLXLM (ORCPT ); Sun, 12 Jul 2009 19:11:12 -0400 Received: from mail-ew0-f226.google.com ([209.85.219.226]:61194 "EHLO mail-ew0-f226.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750921AbZGLXLL (ORCPT ); Sun, 12 Jul 2009 19:11:11 -0400 Received: by ewy26 with SMTP id 26so2212354ewy.37 for ; Sun, 12 Jul 2009 16:11:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=FOvz9STZbmx7W8zxxArA53pklXHCd2f6oNx+5rA83ew=; b=Ifynue1NBZ/Basb9LEx893s3PtJASAd++ofwL5ZRIRQqjbyv0zzgPgixoiMRY6KFI+ 4PEOB6FlZJtpZoB3o7dtDOpkmoaLUWI8pcKK69LEgEl5TVOtGrE/gnaVJ3bC6TZua/b2 UVfM7fIEUzSBcgaL4AqeMGw14i4APX0U3YXTc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=dU9gYgqyu/7KGovafWWlu+k6kgLWpCoc49UFnuVm96oWRoWrnDW6qw5ww1OhX9cjTn MnvSdNu5+6QsNtzzt9fpQ7lXpz+ce0V9X600EkUaJrNSx7jfEWeXOenTye0j5CiLXlEq zJ4EY3lQTbQMmeAP1/Yjy99TbycJPaTQ6Hg+8= Received: by 10.210.65.16 with SMTP id n16mr5391985eba.87.1247440269772; Sun, 12 Jul 2009 16:11:09 -0700 (PDT) Received: from zoinx.mars (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 7sm5006781eyb.15.2009.07.12.16.11.09 (version=SSLv3 cipher=RC4-MD5); Sun, 12 Jul 2009 16:11:09 -0700 (PDT) Message-ID: <4A5A6DE5.4090801@gmail.com> Date: Mon, 13 Jul 2009 01:12:37 +0200 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1b3pre) Gecko/20090513 Fedora/3.0-2.3.beta2.fc11 Thunderbird/3.0b2 MIME-Version: 1.0 To: jcliburn@gmail.com, atl1-devel@lists.sourceforge.net, Andrew Morton , netdev , David Miller Subject: [PATCH] atlx: duplicate testing of MCAST flag Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix duplicate testing of MCAST flag Signed-off-by: Roel Kluin Acked-by: Jay Cliburn --- I think the first should be UCAST, correct? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index c734b19..204db96 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c @@ -2071,7 +2071,7 @@ static int atl2_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE)) return -EOPNOTSUPP; - if (wol->wolopts & (WAKE_MCAST|WAKE_BCAST|WAKE_MCAST)) + if (wol->wolopts & (WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)) return -EOPNOTSUPP; /* these settings will always override what we currently have */