David S. Miller 7ce5a27f2e Revert "net: Handle CHECKSUM_COMPLETE more adequately in pskb_trim_rcsum()." ...

This reverts commit 018c5bba052b3a383d83cf0c756da0e7bc748397.

It causes regressions for people using chips driven by the sungem
driver.  Suspicion is that the skb->csum value isn't being adjusted
properly.

The change also has a bug in that if __pskb_trim() fails, we'll leave
a corruped skb->csum value in there.  We would really need to revert
it to it's original value in that case.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-12-02 17:26:05 -05:00

..

acpi

Merge branch 'acpica'

2013-11-27 01:03:27 +01:00

asm-generic

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2013-11-23 16:18:25 -08:00

clocksource

…

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2013-11-23 16:18:25 -08:00

drm

Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes

2013-11-21 18:46:56 +10:00

dt-bindings

For the 3.13 merge window we have a couple of new drivers for the AMS

2013-11-15 16:37:40 -08:00

keys

…

kvm

…

linux

Revert "net: Handle CHECKSUM_COMPLETE more adequately in pskb_trim_rcsum()."

2013-12-02 17:26:05 -05:00

math-emu

…

media

Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2013-11-18 15:50:07 -08:00

memory

…

misc

…

net

sctp: Restore 'resent' bit to avoid retransmitted chunks for RTT measurements

2013-11-28 18:29:58 -05:00

pcmcia

…

ras

…

rdma

Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next

2013-11-17 08:22:19 -08:00

rxrpc

…

scsi

Main batch of InfiniBand/RDMA changes for 3.13:

2013-11-18 15:36:04 -08:00

sound

Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next

2013-11-08 10:43:40 +00:00

target

target_core_alua: Store supported ALUA states

2013-11-20 11:26:37 -08:00

trace

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-12-02 10:13:09 -08:00

uapi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-12-02 10:09:07 -08:00

video

fbdev changes for 3.13

2013-11-14 14:44:20 +09:00

xen

Features:

2013-11-15 13:34:37 +09:00

Kbuild

…