[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/20] rtl8139: Move more TCP definitions to common h
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 12/20] rtl8139: Move more TCP definitions to common header |
Date: |
Mon, 23 May 2016 10:13:54 +0800 |
From: Dmitry Fleytman <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/rtl8139.c | 5 -----
include/net/eth.h | 8 ++++++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 1e5ec14..562c1fd 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -1867,11 +1867,6 @@ static int rtl8139_transmit_one(RTL8139State *s, int
descriptor)
return 1;
}
-/* structures and macros for task offloading */
-#define TCP_HEADER_DATA_OFFSET(tcp) (((be16_to_cpu(tcp->th_offset_flags) >>
12)&0xf) << 2)
-#define TCP_FLAGS_ONLY(flags) ((flags)&0x3f)
-#define TCP_HEADER_FLAGS(tcp) TCP_FLAGS_ONLY(be16_to_cpu(tcp->th_offset_flags))
-
#define TCP_HEADER_CLEAR_FLAGS(tcp, off) ((tcp)->th_offset_flags &=
cpu_to_be16(~TCP_FLAGS_ONLY(off)))
/* produces ones' complement sum of data */
diff --git a/include/net/eth.h b/include/net/eth.h
index 18d0be3..5a32259 100644
--- a/include/net/eth.h
+++ b/include/net/eth.h
@@ -67,6 +67,14 @@ typedef struct tcp_header {
uint16_t th_urp; /* urgent pointer */
} tcp_header;
+#define TCP_FLAGS_ONLY(flags) ((flags) & 0x3f)
+
+#define TCP_HEADER_FLAGS(tcp) \
+ TCP_FLAGS_ONLY(be16_to_cpu((tcp)->th_offset_flags))
+
+#define TCP_HEADER_DATA_OFFSET(tcp) \
+ (((be16_to_cpu((tcp)->th_offset_flags) >> 12) & 0xf) << 2)
+
typedef struct udp_header {
uint16_t uh_sport; /* source port */
uint16_t uh_dport; /* destination port */
--
2.7.4
- [Qemu-devel] [PULL 02/20] net: mipsnet: check packet length against buffer, (continued)
- [Qemu-devel] [PULL 02/20] net: mipsnet: check packet length against buffer, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 01/20] net/tap: Allocating Large sized arrays to heap, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 03/20] msix: make msix_clr_pending() visible for clients, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 05/20] pcie: Add support for PCIe CAP v1, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 04/20] pci: Introduce define for PM capability version 1.1, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 06/20] pcie: Introduce function for DSN capability creation, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 07/20] vmxnet3: Use generic function for DSN capability definition, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 08/20] net: Introduce Toeplitz hash calculator, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 09/20] net: Add macros for MAC address tracing, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 10/20] vmxnet3: Use common MAC address tracing macros, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 12/20] rtl8139: Move more TCP definitions to common header,
Jason Wang <=
- [Qemu-devel] [PULL 14/20] vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 11/20] net_pkt: Name vmxnet3 packet abstractions more generic, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 13/20] net_pkt: Extend packet abstraction as required by e1000e functionality, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 15/20] e1000_regs: Add definitions for Intel 82574-specific bits, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 16/20] e1000: Move out code that will be reused in e1000e, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 18/20] e1000e: Introduce qtest for e1000e device, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 20/20] net/net: Add SocketReadState for reuse codes, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 19/20] net: vl: Move default_net to vl.c, Jason Wang, 2016/05/22
- [Qemu-devel] [PULL 17/20] net: Introduce e1000e device emulation, Jason Wang, 2016/05/22
- Re: [Qemu-devel] [PULL 00/20] Net patches, Peter Maydell, 2016/05/23