[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 14/48] net/eth: Rename eth_setup_vlan_headers_ex
From: |
Akihiko Odaki |
Subject: |
[PATCH v4 14/48] net/eth: Rename eth_setup_vlan_headers_ex |
Date: |
Wed, 26 Apr 2023 19:36:42 +0900 |
The old eth_setup_vlan_headers has no user so remove it and rename
eth_setup_vlan_headers_ex.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/net/eth.h | 9 +--------
hw/net/net_tx_pkt.c | 2 +-
net/eth.c | 2 +-
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/include/net/eth.h b/include/net/eth.h
index 9f19c3a695..e8af5742be 100644
--- a/include/net/eth.h
+++ b/include/net/eth.h
@@ -351,16 +351,9 @@ eth_strip_vlan_ex(const struct iovec *iov, int iovcnt,
size_t iovoff,
uint16_t
eth_get_l3_proto(const struct iovec *l2hdr_iov, int iovcnt, size_t l2hdr_len);
-void eth_setup_vlan_headers_ex(struct eth_header *ehdr, uint16_t vlan_tag,
+void eth_setup_vlan_headers(struct eth_header *ehdr, uint16_t vlan_tag,
uint16_t vlan_ethtype, bool *is_new);
-static inline void
-eth_setup_vlan_headers(struct eth_header *ehdr, uint16_t vlan_tag,
- bool *is_new)
-{
- eth_setup_vlan_headers_ex(ehdr, vlan_tag, ETH_P_VLAN, is_new);
-}
-
uint8_t eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto);
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
index cc36750c9b..ce6b102391 100644
--- a/hw/net/net_tx_pkt.c
+++ b/hw/net/net_tx_pkt.c
@@ -368,7 +368,7 @@ void net_tx_pkt_setup_vlan_header_ex(struct NetTxPkt *pkt,
bool is_new;
assert(pkt);
- eth_setup_vlan_headers_ex(pkt->vec[NET_TX_PKT_L2HDR_FRAG].iov_base,
+ eth_setup_vlan_headers(pkt->vec[NET_TX_PKT_L2HDR_FRAG].iov_base,
vlan, vlan_ethtype, &is_new);
/* update l2hdrlen */
diff --git a/net/eth.c b/net/eth.c
index d7b30df79f..b6ff89c460 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -21,7 +21,7 @@
#include "net/checksum.h"
#include "net/tap.h"
-void eth_setup_vlan_headers_ex(struct eth_header *ehdr, uint16_t vlan_tag,
+void eth_setup_vlan_headers(struct eth_header *ehdr, uint16_t vlan_tag,
uint16_t vlan_ethtype, bool *is_new)
{
struct vlan_header *vhdr = PKT_GET_VLAN_HDR(ehdr);
--
2.40.0
- [PATCH v4 04/48] igb: Fix Rx packet type encoding, (continued)
- [PATCH v4 04/48] igb: Fix Rx packet type encoding, Akihiko Odaki, 2023/04/26
- [PATCH v4 05/48] igb: Do not require CTRL.VME for tx VLAN tagging, Akihiko Odaki, 2023/04/26
- [PATCH v4 06/48] igb: Clear IMS bits when committing ICR access, Akihiko Odaki, 2023/04/26
- [PATCH v4 07/48] net/net_rx_pkt: Use iovec for net_rx_pkt_set_protocols(), Akihiko Odaki, 2023/04/26
- [PATCH v4 08/48] e1000e: Always copy ethernet header, Akihiko Odaki, 2023/04/26
- [PATCH v4 09/48] igb: Always copy ethernet header, Akihiko Odaki, 2023/04/26
- [PATCH v4 10/48] Fix references to igb Avocado test, Akihiko Odaki, 2023/04/26
- [PATCH v4 11/48] tests/avocado: Remove unused imports, Akihiko Odaki, 2023/04/26
- [PATCH v4 12/48] tests/avocado: Remove test_igb_nomsi_kvm, Akihiko Odaki, 2023/04/26
- [PATCH v4 13/48] hw/net/net_tx_pkt: Remove net_rx_pkt_get_l4_info, Akihiko Odaki, 2023/04/26
- [PATCH v4 14/48] net/eth: Rename eth_setup_vlan_headers_ex,
Akihiko Odaki <=
- [PATCH v4 15/48] e1000x: Share more Rx filtering logic, Akihiko Odaki, 2023/04/26
- [PATCH v4 16/48] e1000x: Take CRC into consideration for size check, Akihiko Odaki, 2023/04/26
- [PATCH v4 17/48] e1000x: Rename TcpIpv6 into TcpIpv6Ex, Akihiko Odaki, 2023/04/26
- [PATCH v4 18/48] e1000e: Always log status after building rx metadata, Akihiko Odaki, 2023/04/26
- [PATCH v4 19/48] igb: Always log status after building rx metadata, Akihiko Odaki, 2023/04/26
- [PATCH v4 20/48] igb: Remove goto, Akihiko Odaki, 2023/04/26
- [PATCH v4 21/48] igb: Read DCMD.VLE of the first Tx descriptor, Akihiko Odaki, 2023/04/26
- [PATCH v4 22/48] e1000e: Reset packet state after emptying Tx queue, Akihiko Odaki, 2023/04/26
- [PATCH v4 23/48] vmxnet3: Reset packet state after emptying Tx queue, Akihiko Odaki, 2023/04/26
- [PATCH v4 25/48] igb: Share common VF constants, Akihiko Odaki, 2023/04/26