From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: "Akihiko Odaki" <akihiko.odaki@daynix.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Jason Wang" <jasowang@redhat.com>
Subject: [PULL 31/50] net/eth: Use void pointers
Date: Tue, 23 May 2023 15:32:19 +0800 [thread overview]
Message-ID: <20230523073238.54236-32-jasowang@redhat.com> (raw)
In-Reply-To: <20230523073238.54236-1-jasowang@redhat.com>
From: Akihiko Odaki <akihiko.odaki@daynix.com>
The uses of uint8_t pointers were misleading as they are never accessed
as an array of octets and it even require more strict alignment to
access as struct eth_header.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
include/net/eth.h | 4 ++--
net/eth.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/net/eth.h b/include/net/eth.h
index 05f5693..95ff24d 100644
--- a/include/net/eth.h
+++ b/include/net/eth.h
@@ -342,12 +342,12 @@ eth_get_pkt_tci(const void *p)
size_t
eth_strip_vlan(const struct iovec *iov, int iovcnt, size_t iovoff,
- uint8_t *new_ehdr_buf,
+ void *new_ehdr_buf,
uint16_t *payload_offset, uint16_t *tci);
size_t
eth_strip_vlan_ex(const struct iovec *iov, int iovcnt, size_t iovoff,
- uint16_t vet, uint8_t *new_ehdr_buf,
+ uint16_t vet, void *new_ehdr_buf,
uint16_t *payload_offset, uint16_t *tci);
uint16_t
diff --git a/net/eth.c b/net/eth.c
index b6ff89c..f7ffbda 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -226,11 +226,11 @@ void eth_get_protocols(const struct iovec *iov, size_t iovcnt, size_t iovoff,
size_t
eth_strip_vlan(const struct iovec *iov, int iovcnt, size_t iovoff,
- uint8_t *new_ehdr_buf,
+ void *new_ehdr_buf,
uint16_t *payload_offset, uint16_t *tci)
{
struct vlan_header vlan_hdr;
- struct eth_header *new_ehdr = (struct eth_header *) new_ehdr_buf;
+ struct eth_header *new_ehdr = new_ehdr_buf;
size_t copied = iov_to_buf(iov, iovcnt, iovoff,
new_ehdr, sizeof(*new_ehdr));
@@ -276,7 +276,7 @@ eth_strip_vlan(const struct iovec *iov, int iovcnt, size_t iovoff,
size_t
eth_strip_vlan_ex(const struct iovec *iov, int iovcnt, size_t iovoff,
- uint16_t vet, uint8_t *new_ehdr_buf,
+ uint16_t vet, void *new_ehdr_buf,
uint16_t *payload_offset, uint16_t *tci)
{
struct vlan_header vlan_hdr;
--
2.7.4
next prev parent reply other threads:[~2023-05-23 7:38 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 7:31 [PULL 00/50] Net patches Jason Wang
2023-05-23 7:31 ` [PULL 01/50] e1000e: Fix tx/rx counters Jason Wang
2023-05-23 7:31 ` [PULL 02/50] hw/net/net_tx_pkt: Decouple implementation from PCI Jason Wang
2023-05-23 7:31 ` [PULL 03/50] hw/net/net_tx_pkt: Decouple interface " Jason Wang
2023-05-23 7:31 ` [PULL 04/50] e1000x: Fix BPRC and MPRC Jason Wang
2023-05-23 7:31 ` [PULL 05/50] igb: Fix Rx packet type encoding Jason Wang
2023-05-23 7:31 ` [PULL 06/50] igb: Do not require CTRL.VME for tx VLAN tagging Jason Wang
2023-05-23 7:31 ` [PULL 07/50] igb: Clear IMS bits when committing ICR access Jason Wang
2023-05-23 7:31 ` [PULL 08/50] net/net_rx_pkt: Use iovec for net_rx_pkt_set_protocols() Jason Wang
2023-05-23 7:31 ` [PULL 09/50] e1000e: Always copy ethernet header Jason Wang
2023-05-23 7:31 ` [PULL 10/50] igb: " Jason Wang
2023-05-23 7:31 ` [PULL 11/50] Fix references to igb Avocado test Jason Wang
2023-05-23 7:32 ` [PULL 12/50] tests/avocado: Remove unused imports Jason Wang
2023-05-23 7:32 ` [PULL 13/50] tests/avocado: Remove test_igb_nomsi_kvm Jason Wang
2023-05-23 7:32 ` [PULL 14/50] hw/net/net_tx_pkt: Remove net_rx_pkt_get_l4_info Jason Wang
2023-05-23 7:32 ` [PULL 15/50] net/eth: Rename eth_setup_vlan_headers_ex Jason Wang
2023-05-23 7:32 ` [PULL 16/50] e1000x: Share more Rx filtering logic Jason Wang
2023-05-23 7:32 ` [PULL 17/50] e1000x: Take CRC into consideration for size check Jason Wang
2023-05-23 7:32 ` [PULL 18/50] e1000x: Rename TcpIpv6 into TcpIpv6Ex Jason Wang
2023-05-23 7:32 ` [PULL 19/50] e1000e: Always log status after building rx metadata Jason Wang
2023-05-23 7:32 ` [PULL 20/50] igb: " Jason Wang
2023-05-23 7:32 ` [PULL 21/50] igb: Remove goto Jason Wang
2023-05-23 7:32 ` [PULL 22/50] igb: Read DCMD.VLE of the first Tx descriptor Jason Wang
2023-05-23 7:32 ` [PULL 23/50] e1000e: Reset packet state after emptying Tx queue Jason Wang
2023-05-23 7:32 ` [PULL 24/50] vmxnet3: " Jason Wang
2023-05-23 7:32 ` [PULL 25/50] igb: Add more definitions for Tx descriptor Jason Wang
2023-05-23 7:32 ` [PULL 26/50] igb: Share common VF constants Jason Wang
2023-05-23 7:32 ` [PULL 27/50] igb: Fix igb_mac_reg_init coding style alignment Jason Wang
2023-05-23 7:32 ` [PULL 28/50] igb: Clear EICR bits for delayed MSI-X interrupts Jason Wang
2023-05-23 7:32 ` [PULL 29/50] e1000e: Rename a variable in e1000e_receive_internal() Jason Wang
2023-05-23 7:32 ` [PULL 30/50] igb: Rename a variable in igb_receive_internal() Jason Wang
2023-05-23 7:32 ` Jason Wang [this message]
2023-05-23 7:32 ` [PULL 32/50] net/eth: Always add VLAN tag Jason Wang
2023-05-23 7:32 ` [PULL 33/50] hw/net/net_rx_pkt: Enforce alignment for eth_header Jason Wang
2023-05-23 7:32 ` [PULL 34/50] tests/qtest/libqos/igb: Set GPIE.Multiple_MSIX Jason Wang
2023-05-23 7:32 ` [PULL 35/50] igb: Implement MSI-X single vector mode Jason Wang
2023-05-23 7:32 ` [PULL 36/50] igb: Use UDP for RSS hash Jason Wang
2023-05-23 7:32 ` [PULL 37/50] igb: Implement Rx SCTP CSO Jason Wang
2023-05-23 7:32 ` [PULL 38/50] igb: Implement Tx " Jason Wang
2023-05-23 7:32 ` [PULL 39/50] igb: Strip the second VLAN tag for extended VLAN Jason Wang
2023-05-23 7:32 ` [PULL 40/50] igb: Filter with " Jason Wang
2023-05-23 7:32 ` [PULL 41/50] igb: Implement igb-specific oversize check Jason Wang
2023-05-23 7:32 ` [PULL 42/50] igb: Implement Rx PTP2 timestamp Jason Wang
2023-05-23 7:32 ` [PULL 43/50] igb: Implement Tx timestamp Jason Wang
2023-05-23 7:32 ` [PULL 44/50] e1000e: Notify only new interrupts Jason Wang
2023-05-23 7:32 ` [PULL 45/50] igb: " Jason Wang
2023-05-23 7:32 ` [PULL 46/50] igb: Clear-on-read ICR when ICR.INTA is set Jason Wang
2023-05-23 7:32 ` [PULL 47/50] vmxnet3: Do not depend on PC Jason Wang
2023-05-23 7:32 ` [PULL 48/50] MAINTAINERS: Add a reviewer for network packet abstractions Jason Wang
2023-05-23 7:32 ` [PULL 49/50] docs/system/devices/igb: Note igb is tested for DPDK Jason Wang
2023-05-23 7:32 ` [PULL 50/50] rtl8139: fix large_send_mss divide-by-zero Jason Wang
2023-05-23 17:56 ` [PULL 00/50] Net patches Richard Henderson
2023-05-23 19:53 ` Michael Tokarev
2023-05-24 4:06 ` Jason Wang
2023-05-24 4:21 ` Akihiko Odaki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230523073238.54236-32-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=akihiko.odaki@daynix.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).