From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id C949642E75;
	Mon, 17 Jul 2023 21:16:01 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id 9C0F940A80;
	Mon, 17 Jul 2023 21:16:01 +0200 (CEST)
Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com
 [209.85.210.169])
 by mails.dpdk.org (Postfix) with ESMTP id A55454068E
 for <dev@dpdk.org>; Mon, 17 Jul 2023 21:15:59 +0200 (CEST)
Received: by mail-pf1-f169.google.com with SMTP id
 d2e1a72fcca58-66f5faba829so3533684b3a.3
 for <dev@dpdk.org>; Mon, 17 Jul 2023 12:15:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1689621358;
 x=1692213358; 
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=ra901rYqezMRS3w53XvcqRRa9Y/gASIo8/sYrjV805c=;
 b=hpEdsKLuxIwomrsGFuG4mVpp10T6kHOgV8ahdl1FPYsmBT6BPIuGc8DKd9jS239v9q
 oWkuFezTHGj6VsqnhGFbGIuaEFsztmw9zvXOt+SWMKZyVRCw9MdTN4MZ18KrkVby4Lux
 L4k7yN0dkpOrhu4OEwy5/RrZFsRTisMdfZbQCEOKNMuVk58/TQLg77hd326BLfWZvtyj
 YV1y4pfoTwJbn+t6emOY1eHSRBZZwLzNoqFfoNGZ+i9u1ZhGdRUhQStOM7G0sBnVnta/
 a2/EnzrQvC29PS1WwNSw3iyAl/8u7yYfAz7piaVij/ZEzvaCd7nSq9vRq1K7HXjvBHe8
 xAJA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20221208; t=1689621358; x=1692213358;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=ra901rYqezMRS3w53XvcqRRa9Y/gASIo8/sYrjV805c=;
 b=OXEUHUDFdVFr4xTfkxvsrwlE4eBX3CzEu7wAIZnfIXBeaaBfaFCYozOc6Ccb+C1Rn0
 tiwKKEl6NIHjoP/gwqBYss9it5vxpEG+ILYYMrdpInb2JZmnJRP+0pnyAyt3FZRXSjQj
 JxShSj8cKKyucK3UNrzlCDnHGi9n6UB3/bsmdg0Il1xjt/09UwBSgZY9jP2lHoFnQ8C3
 1Zs8jn/e44zaekeowo3Ko6x/Gu2GIuLSmCvq30LcVVc2pRamlQ4rUtAAY/ZBjOxCU8iX
 X7TJyJoZR+FRZ43HQjr3jtMo2bm7Bla6n71Fzm14e1In2/FW3EwrKaLEOemGdfPvjUU9
 wBTw==
X-Gm-Message-State: ABy/qLY3ToB8yAH9Qs9dZKgwnkXMVdxFEr0eUQLgatNRXwTsdCLUGXHt
 IASdgNlBDKJQX2zjcJ49I6DCn3QzI/j35HQLwJz2RQ==
X-Google-Smtp-Source: APBJJlE2FQrJKekqME21iCJaZoY6FTIqRcPvL+9W62UiiQDI/1djMOBn0ece5WaR2jhuStadQUUV9Q==
X-Received: by 2002:a05:6a20:2450:b0:134:fd58:ce41 with SMTP id
 t16-20020a056a20245000b00134fd58ce41mr518047pzc.12.1689621358394; 
 Mon, 17 Jul 2023 12:15:58 -0700 (PDT)
Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207])
 by smtp.gmail.com with ESMTPSA id
 x7-20020aa79187000000b00679dc747738sm172512pfa.10.2023.07.17.12.15.57
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 17 Jul 2023 12:15:58 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH] tap: fix build of tap_bpf_program
Date: Mon, 17 Jul 2023 12:15:48 -0700
Message-Id: <20230717191548.16429-1-stephen@networkplumber.org>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org

The tap_bpf_program.c is not built as part of normal DPDK
EAL environment. It is intended to be built standalone
and does not use rte_common.h.

This reverts the related change from
commit ef5baf3486e0 ("replace packed attributes")

Note: this patch will cause expected warnings from checkpatch
because the code involved is not used directly in DPDK environment.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/tap/tap_bpf_program.c | 4 ++--
 drivers/net/tap/tap_rss.h         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/tap/tap_bpf_program.c b/drivers/net/tap/tap_bpf_program.c
index 20c310e5e7ba..532e8838fe27 100644
--- a/drivers/net/tap/tap_bpf_program.c
+++ b/drivers/net/tap/tap_bpf_program.c
@@ -75,14 +75,14 @@ struct ipv4_l3_l4_tuple {
 	__u32    dst_addr;
 	__u16    dport;
 	__u16    sport;
-} __rte_packed;
+} __attribute__((packed));
 
 struct ipv6_l3_l4_tuple {
 	__u8        src_addr[16];
 	__u8        dst_addr[16];
 	__u16       dport;
 	__u16       sport;
-} __rte_packed;
+} __attribute__((packed));
 
 static const __u8 def_rss_key[TAP_RSS_HASH_KEY_SIZE] = {
 	0xd1, 0x81, 0xc6, 0x2c,
diff --git a/drivers/net/tap/tap_rss.h b/drivers/net/tap/tap_rss.h
index 48c151cf6b68..dff46a012f94 100644
--- a/drivers/net/tap/tap_rss.h
+++ b/drivers/net/tap/tap_rss.h
@@ -35,6 +35,6 @@ struct rss_key {
 	__u32 key_size;
 	__u32 queues[TAP_MAX_QUEUES];
 	__u32 nb_queues;
-} __rte_packed;
+} __attribute__((packed));
 
 #endif /* _TAP_RSS_H_ */
-- 
2.39.2