Commit 66409b7c authored by Dmitry Fleytman's avatar Dmitry Fleytman Committed by Jason Wang
Browse files

rtl8139: Move more TCP definitions to common header 



Signed-off-by: default avatarDmitry Fleytman <dmitry.fleytman@ravellosystems.com>
Signed-off-by: default avatarLeonid Bloch <leonid.bloch@ravellosystems.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 605d52e6

hw/net/rtl8139.c

+0 −5
Original line number Diff line number Diff line
@@ -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 */

include/net/eth.h

+8 −0
Original line number Diff line number Diff line
@@ -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 */