From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42E94C10F11 for ; Wed, 24 Apr 2019 14:46:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13F3A218FD for ; Wed, 24 Apr 2019 14:46:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556117196; bh=6DehphqxxPwARWBE5ME3ZUahnLAKINS4KsfVTVCj/FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fVqS5MNo/e5XAzvhL6qHMmSbnSwrsfVjdoYOVPTjG0Rkgr5yujMo7VDFTAxj6+qOx 1dz4aJ2mHGpqvOmpaRBtUfrupUFpQBZxOTAd2erMt914T3YkhO8UaWuhDwIQTtBzZy gcyU092azPhSDzNzQxo4CVUXxiPHlNDv8kEjnN0U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731040AbfDXOe1 (ORCPT ); Wed, 24 Apr 2019 10:34:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:38322 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730968AbfDXOeZ (ORCPT ); Wed, 24 Apr 2019 10:34:25 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3F5F218FE; Wed, 24 Apr 2019 14:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556116464; bh=6DehphqxxPwARWBE5ME3ZUahnLAKINS4KsfVTVCj/FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rA4YtURVoLh8tU8+MQnOPDe/RMCOiTq7dCTU0iKq1pRs+3P0wAGrwtRuu/bJw0wZg 4AieL2fiS2NpMOBOWPhRLbwrF/aEOLMPzCyo+X30noTza4oT/u+B4RtmhILWIT0t1a w/W6u/nYmzHVP94sQ+JxpntSU67nHHXz5UUTuHa8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stefan Assmann , Jeff Kirsher , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 18/66] i40e: fix WoL support check Date: Wed, 24 Apr 2019 10:32:52 -0400 Message-Id: <20190424143341.27665-18-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424143341.27665-1-sashal@kernel.org> References: <20190424143341.27665-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stefan Assmann [ Upstream commit f669d24f3dd00beab452c0fc9257f6a942ffca9b ] The current check for WoL on i40e is broken. Code comment says only magic packet is supported, so only check for that. Fixes: 540a152da762 (i40e/ixgbe/igb: fail on new WoL flag setting WAKE_MAGICSECURE) Signed-off-by: Stefan Assmann Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin (Microsoft) --- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index a6bc7847346b..5d544e661445 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -2378,8 +2378,7 @@ static int i40e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) return -EOPNOTSUPP; /* only magic packet is supported */ - if (wol->wolopts && (wol->wolopts != WAKE_MAGIC) - | (wol->wolopts != WAKE_FILTER)) + if (wol->wolopts & ~WAKE_MAGIC) return -EOPNOTSUPP; /* is this a new value? */ -- 2.19.1