From patchwork Wed Dec 13 22:40:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Bandewar X-Patchwork-Id: 848268 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bandewar-net.20150623.gappssmtp.com header.i=@bandewar-net.20150623.gappssmtp.com header.b="N98zVey8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yxs8s6mCwz9s9Y for ; Thu, 14 Dec 2017 09:40:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752665AbdLMWk2 (ORCPT ); Wed, 13 Dec 2017 17:40:28 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:42357 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752530AbdLMWk0 (ORCPT ); Wed, 13 Dec 2017 17:40:26 -0500 Received: by mail-it0-f65.google.com with SMTP id p139so6884274itb.1 for ; Wed, 13 Dec 2017 14:40:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bandewar-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=WIZUXcpGp2ic/SmC96ShOtPnOuvW7/0D9+90Zp01Bxc=; b=N98zVey8hJt7o/G4CD1472VoOqJkUYwp8IiNgrjqN6OD9zF7gcg93tjC8vfgr7zEhl V2juWH4BpI00xQDJsd4dsCDn7sqnYHhXX0VexpFs/WYq9c/F7VydU1AwwofFk3H2KHvi v1a1bm5qhe3QSYGSRW4j20FssS2FHn+oyedy3kIQCpGBvuGE77hKyqLq8jzG59fZ2ve2 a3P+P3O6l7iFL6D/jQ91Nc2tUDJZLLOpIK1E6R8uQcVMudCo4H46laeLgG3tO5aRnrBU X1WQh+mtC+S/mH3Wm5oiID+KiRyt6KXCnzDKv/7zDM9iWJXLbTJjq1yLOIBJv5hmM5tG h/Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WIZUXcpGp2ic/SmC96ShOtPnOuvW7/0D9+90Zp01Bxc=; b=HHylIemH+srdJVW6twWkeN7WlGS6YvPioEjFhmvAVFg0SM5GneGUYe9aFkLehKuao7 f19ocV+4oJFIEaPxoQ2Fq5CsaCXaQZtn0xu3JpnYpOnAOganDsz0Zkf3lR7FgNlT+/Mc yxy+HftcgUiC+vYYSUx0RRgWgxvIwq/0ftbJC0nLIohoLEoarxEsnw/5gzCTvzkrITQ3 q+14AAkRURkxetgqsR9eGOB69a5qTVafLvxCPTAoKOj2ZygG2M2cMi+xZv5oUVvQAl/X DnkI2slNaHRetwSsrLO5PcuLp1tpMJVGI72/lWG1HXcrqM5QPhpF0MwPMUtW7YH5Zrwk 22Og== X-Gm-Message-State: AKGB3mI9j+BAxqNPzSUCZXhb+EHdo5I0J+ELThm3KmW5mblP75Uz5wgD sZFeVEowRKclxzZV+oG0hdkGFQ== X-Google-Smtp-Source: ACJfBotZbN4c1CNixFLIiAKPEnjhaTxIsVrz2P/uZ8xziSIfRoEOYetu1vP9kCbqXT1V3cTU9YCN9w== X-Received: by 10.107.164.202 with SMTP id d71mr609112ioj.204.1513204826367; Wed, 13 Dec 2017 14:40:26 -0800 (PST) Received: from localhost ([2620:15c:2c4:201:c094:33ff:f0a:1711]) by smtp.gmail.com with ESMTPSA id c8sm1494610itg.15.2017.12.13.14.40.25 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 13 Dec 2017 14:40:25 -0800 (PST) From: Mahesh Bandewar To: David Miller , Netdev Cc: Eric Dumazet , Mahesh Bandewar , Mahesh Bandewar Subject: [PATCH next 1/2] Revert "ipvlan: add L2 check for packets arriving via virtual devices" Date: Wed, 13 Dec 2017 14:40:23 -0800 Message-Id: <20171213224023.202890-1-mahesh@bandewar.net> X-Mailer: git-send-email 2.15.1.504.g5279b80103-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mahesh Bandewar This reverts commit 92ff42645028fa6f9b8aa767718457b9264316b4. Even though the check added is not that taxing, it's not really needed. First of all this will be per packet cost and second thing is that the eth_type_trans() already does this correctly. The excessive scrubbing in IPvlan was changing the pkt-type skb metadata of the packet which made it necessary to re-check the mac. The subsequent patch in this series removes the faulty packet-scrub. Signed-off-by: Mahesh Bandewar --- drivers/net/ipvlan/ipvlan_core.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index 0bc7f721b717..9774c96ac7bb 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -322,10 +322,6 @@ static int ipvlan_rcv_frame(struct ipvl_addr *addr, struct sk_buff **pskb, if (dev_forward_skb(ipvlan->dev, skb) == NET_RX_SUCCESS) success = true; } else { - if (!ether_addr_equal_64bits(eth_hdr(skb)->h_dest, - ipvlan->phy_dev->dev_addr)) - skb->pkt_type = PACKET_OTHERHOST; - ret = RX_HANDLER_ANOTHER; success = true; }