[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/51] e1000x: Alter the signature of e1000x_is_vlan_packet
From: |
Jason Wang |
Subject: |
[PULL 20/51] e1000x: Alter the signature of e1000x_is_vlan_packet |
Date: |
Tue, 7 Mar 2023 15:07:45 +0800 |
From: Akihiko Odaki <akihiko.odaki@daynix.com>
e1000x_is_vlan_packet() had a pointer to uint8_t as a parameter, but
it does not have to be uint8_t. Change the type to void *.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/e1000x_common.c | 2 +-
hw/net/e1000x_common.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/net/e1000x_common.c b/hw/net/e1000x_common.c
index b3bbf31..e6387dd 100644
--- a/hw/net/e1000x_common.c
+++ b/hw/net/e1000x_common.c
@@ -47,7 +47,7 @@ bool e1000x_rx_ready(PCIDevice *d, uint32_t *mac)
return true;
}
-bool e1000x_is_vlan_packet(const uint8_t *buf, uint16_t vet)
+bool e1000x_is_vlan_packet(const void *buf, uint16_t vet)
{
uint16_t eth_proto = lduw_be_p(&PKT_GET_ETH_HDR(buf)->h_proto);
bool res = (eth_proto == vet);
diff --git a/hw/net/e1000x_common.h b/hw/net/e1000x_common.h
index b991d81..86a31b6 100644
--- a/hw/net/e1000x_common.h
+++ b/hw/net/e1000x_common.h
@@ -178,7 +178,7 @@ uint32_t e1000x_rxbufsize(uint32_t rctl);
bool e1000x_rx_ready(PCIDevice *d, uint32_t *mac);
-bool e1000x_is_vlan_packet(const uint8_t *buf, uint16_t vet);
+bool e1000x_is_vlan_packet(const void *buf, uint16_t vet);
bool e1000x_rx_group_filter(uint32_t *mac, const uint8_t *buf);
--
2.7.4
- [PULL 10/51] e1000: Use memcpy to intialize registers, (continued)
- [PULL 10/51] e1000: Use memcpy to intialize registers, Jason Wang, 2023/03/07
- [PULL 11/51] e1000e: Use memcpy to intialize registers, Jason Wang, 2023/03/07
- [PULL 12/51] e1000e: Remove pending interrupt flags, Jason Wang, 2023/03/07
- [PULL 13/51] e1000e: Improve software reset, Jason Wang, 2023/03/07
- [PULL 14/51] e1000: Configure ResettableClass, Jason Wang, 2023/03/07
- [PULL 15/51] e1000e: Configure ResettableClass, Jason Wang, 2023/03/07
- [PULL 16/51] e1000e: Introduce e1000_rx_desc_union, Jason Wang, 2023/03/07
- [PULL 17/51] e1000e: Set MII_ANER_NWAY, Jason Wang, 2023/03/07
- [PULL 18/51] e1000e: Remove extra pointer indirection, Jason Wang, 2023/03/07
- [PULL 19/51] net: Check L4 header size, Jason Wang, 2023/03/07
- [PULL 20/51] e1000x: Alter the signature of e1000x_is_vlan_packet,
Jason Wang <=
- [PULL 21/51] net: Strip virtio-net header when dumping, Jason Wang, 2023/03/07
- [PULL 22/51] hw/net/net_tx_pkt: Automatically determine if virtio-net header is used, Jason Wang, 2023/03/07
- [PULL 23/51] hw/net/net_rx_pkt: Remove net_rx_pkt_has_virt_hdr, Jason Wang, 2023/03/07
- [PULL 24/51] e1000e: Perform software segmentation for loopback, Jason Wang, 2023/03/07
- [PULL 27/51] e1000e: Do not assert when MSI-X is disabled later, Jason Wang, 2023/03/07
- [PULL 25/51] hw/net/net_tx_pkt: Implement TCP segmentation, Jason Wang, 2023/03/07
- [PULL 26/51] hw/net/net_tx_pkt: Check the payload length, Jason Wang, 2023/03/07
- [PULL 28/51] MAINTAINERS: Add Akihiko Odaki as a e1000e reviewer, Jason Wang, 2023/03/07
- [PULL 29/51] MAINTAINERS: Add e1000e test files, Jason Wang, 2023/03/07
- [PULL 30/51] e1000e: Combine rx traces, Jason Wang, 2023/03/07