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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 1CF6BC43381 for ; Mon, 4 Mar 2019 08:41:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D885D20836 for ; Mon, 4 Mar 2019 08:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688909; bh=ZII+5kFh7/oSg3GFZ7RIFcM7Kd+LOYU8JhNAXrT+nVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tsc5a/xczTVG+2KjX83bvgqTU/6Xy925JFRhPxxbZgg1CEjhNMnk9BtOFt0IMpj0x h4Wyb3FOJ4suWLFTm8ohyjPfrmb2XBxTP6ZOWxvymXvViIYH9c91QCZhJY4q5xxml3 Pm3k1F8I2q6bzdGN3M3rrPZ8BpuSftdA6JEAf7P0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727262AbfCDIbj (ORCPT ); Mon, 4 Mar 2019 03:31:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:33962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727970AbfCDIbj (ORCPT ); Mon, 4 Mar 2019 03:31:39 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 37E9221019; Mon, 4 Mar 2019 08:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688298; bh=ZII+5kFh7/oSg3GFZ7RIFcM7Kd+LOYU8JhNAXrT+nVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uUjbXIQelcE8trTTJombi0vcNlTrOoB3R+SPq+GySMLv/i9y0RAi0A/4e+FYWSEj1 kyS8OhuBGTyYGqY4bmlsI5MO7/NhHMDAAHeKmPd2GDCuXD66wbQaJ5WEcijFF+EiMN Jg6KglQnZkG2E2/uhwBGA3V1MAeNeyk8+TQGYpSo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Daniel Borkmann , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 57/78] net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP Date: Mon, 4 Mar 2019 09:22:40 +0100 Message-Id: <20190304081628.092526651@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190304081625.508788074@linuxfoundation.org> References: <20190304081625.508788074@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 3b707c3008cad04604c1f50e39f456621821c414 ] __bpf_redirect() and act_mirred checks this boolean to determine whether to prefix an ethernet header. Signed-off-by: Maciej Żenczykowski Acked-by: Daniel Borkmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/linux/if_arp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 6756fea18b69f..e44746de95cdf 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -54,6 +54,7 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev) case ARPHRD_IPGRE: case ARPHRD_VOID: case ARPHRD_NONE: + case ARPHRD_RAWIP: return false; default: return true; -- 2.19.1