linux-stable/net
Eric Dumazet daa8654828 net: gro: GRO_MERGED_FREE consumes packets
As part of GRO processing, merged skbs should be consumed, not freed, to
not confuse dropwatch/drop_monitor.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-19 14:23:56 -04:00
..
9p net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
802 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
8021q vlan: Stop using NLA_PUT*(). 2012-04-02 04:33:44 -04:00
appletalk net: remove k{un}map_skb_frag() 2012-04-05 05:36:43 -04:00
atm net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
ax25 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
batman-adv batman-adv: skip the window protection test when the originator has no neighbours 2012-04-18 09:54:02 +02:00
bluetooth Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 2012-04-09 15:47:49 -04:00
bridge net: add generic PF_BRIDGE:RTM_ FDB hooks 2012-04-15 13:06:04 -04:00
caif net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
can can: fix sparse warning for cgw_list 2012-04-16 21:08:18 +02:00
ceph net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
core net: gro: GRO_MERGED_FREE consumes packets 2012-04-19 14:23:56 -04:00
dcb net/dcb: Add an optional max rate attribute 2012-04-05 05:08:04 -04:00
dccp ipv6: dccp: dont drop packet but consume it 2012-04-19 14:23:55 -04:00
decnet net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
dns_resolver net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
dsa
econet Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ethernet net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
ieee802154 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
ipv4 net: fix compile error of leaking kmemleak.h header 2012-04-19 00:11:39 -04:00
ipv6 ipv6: tcp: dont drop packet but consume it 2012-04-19 14:23:55 -04:00
ipx
irda net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
iucv Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 2012-03-22 18:15:32 -07:00
key net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
l2tp net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
lapb Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
llc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
mac80211 mac80211: add function retrieve average rssi 2012-04-16 14:38:49 -04:00
netfilter net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
netlabel netlabel: use GFP flags from caller instead of GFP_ATOMIC 2012-03-22 19:29:57 -04:00
netlink netlink: dont drop packet but consume it 2012-04-19 14:23:55 -04:00
netrom net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
nfc Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-04-18 14:27:48 -04:00
openvswitch net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
packet packet: dont drop packet but consume it 2012-04-19 14:23:55 -04:00
phonet net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
rds RDS: use gfp flags from caller in conn_alloc() 2012-03-22 19:29:58 -04:00
rfkill device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
rose net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
rxrpc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
sched pkt_sched: Stop using NLA_PUT*(). 2012-04-01 18:11:37 -04:00
sctp net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
sunrpc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
tipc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
unix net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
wanrouter
wimax net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
wireless Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-04-18 14:27:48 -04:00
x25 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
xfrm net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
compat.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
Kconfig
Makefile
nonet.c
socket.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
sysctl_net.c sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy 2012-01-24 16:40:30 -08:00