From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/net/ixgb/ixgb_main.c | 2 +- drivers/net/sky2.c | 4 ++-- net/ipv4/tcp_input.c | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff -puN drivers/net/ixgb/ixgb_main.c~git-net-fixup drivers/net/ixgb/ixgb_main.c --- a/drivers/net/ixgb/ixgb_main.c~git-net-fixup +++ a/drivers/net/ixgb/ixgb_main.c @@ -1246,7 +1246,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapte unsigned int i; uint8_t css, cso; - if(likely(skb->ip_summed == CHECKSUM_HW)) { + if(likely(skb->ip_summed == CHECKSUM_PARTIAL)) { struct ixgb_buffer *buffer_info; css = skb->h.raw - skb->data; cso = (skb->h.raw + skb->csum) - skb->data; diff -puN net/socket.c~git-net-fixup net/socket.c diff -puN drivers/net/sky2.c~git-net-fixup drivers/net/sky2.c --- a/drivers/net/sky2.c~git-net-fixup +++ a/drivers/net/sky2.c @@ -1284,7 +1284,7 @@ static int sky2_xmit_frame(struct sk_buf #endif /* Handle TCP checksum offload */ - if (skb->ip_summed == CHECKSUM_HW) { + if (skb->ip_summed == CHECKSUM_PARTIAL) { unsigned offset = skb->h.raw - skb->data; u32 tcpsum; @@ -1982,7 +1982,7 @@ static int sky2_status_intr(struct sky2_ #endif case OP_RXCHKS: skb = sky2->rx_ring[sky2->rx_next].skb; - skb->ip_summed = CHECKSUM_HW; + skb->ip_summed = CHECKSUM_COMPLETE; skb->csum = status & 0xffff; break; diff -puN net/ipv4/tcp_input.c~git-net-fixup net/ipv4/tcp_input.c --- a/net/ipv4/tcp_input.c~git-net-fixup +++ a/net/ipv4/tcp_input.c @@ -88,13 +88,8 @@ int sysctl_tcp_max_orphans __read_mostly int sysctl_tcp_frto __read_mostly; int sysctl_tcp_nometrics_save __read_mostly; -<<<<<<< HEAD/net/ipv4/tcp_input.c -int sysctl_tcp_moderate_rcvbuf = 1; -int sysctl_tcp_abc; -======= int sysctl_tcp_moderate_rcvbuf __read_mostly = 1; int sysctl_tcp_abc __read_mostly = 1; ->>>>>>> 7800c382abc6b2416eab2e935ff82c20e2f08acd/net/ipv4/tcp_input.c #define FLAG_DATA 0x01 /* Incoming frame contained data. */ #define FLAG_WIN_UPDATE 0x02 /* Incoming ACK was a window update. */ _