[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V4 15/31] rtl8139: Move more TCP definitions to commo
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V4 15/31] rtl8139: Move more TCP definitions to common header |
Date: |
Thu, 2 Jun 2016 14:48:06 +0800 |
From: Dmitry Fleytman <address@hidden>
Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <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 V4 05/31] pci: fix unaligned access in pci_xxx_quad(), (continued)
- [Qemu-devel] [PULL V4 05/31] pci: fix unaligned access in pci_xxx_quad(), Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 04/31] net/net: Add SocketReadState for reuse codes, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 06/31] msix: make msix_clr_pending() visible for clients, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 07/31] pci: Introduce define for PM capability version 1.1, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 08/31] pcie: Add support for PCIe CAP v1, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 10/31] vmxnet3: Use generic function for DSN capability definition, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 09/31] pcie: Introduce function for DSN capability creation, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 11/31] net: Introduce Toeplitz hash calculator, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 12/31] net: Add macros for MAC address tracing, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 13/31] vmxnet3: Use common MAC address tracing macros, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 15/31] rtl8139: Move more TCP definitions to common header,
Jason Wang <=
- [Qemu-devel] [PULL V4 14/31] net_pkt: Name vmxnet3 packet abstractions more generic, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 17/31] vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 16/31] net_pkt: Extend packet abstraction as required by e1000e functionality, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 18/31] e1000_regs: Add definitions for Intel 82574-specific bits, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 19/31] e1000: Move out code that will be reused in e1000e, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 22/31] net: improve UDP/TCP checksum computation., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 21/31] e1000e: Introduce qtest for e1000e device, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 24/31] i.MX: Fix FEC code for MDIO operation selection, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 23/31] net: handle optional VLAN header in checksum computation., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 26/31] i.MX: Fix FEC code for ECR register reset value., Jason Wang, 2016/06/02