Herbert Xu
d55d87fdff
net: Move rx skb_orphan call to where needed ...
In order to get the tun driver to account packets, we need to be
able to receive packets with destructors set. To be on the safe
side, I added an skb_orphan call for all protocols by default since
some of them (IP in particular) cannot handle receiving packets
destructors properly.
Now it seems that at least one protocol (CAN) expects to be able
to pass skb->sk through the rx path without getting clobbered.
So this patch attempts to fix this properly by moving the skb_orphan
call to where it's actually needed. In particular, I've added it
to skb_set_owner_[rw] which is what most users of skb->destructor
call.
This is actually an improvement for tun too since it means that
we only give back the amount charged to the socket when the skb
is passed to another socket that will also be charged accordingly.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Oliver Hartkopp <olver@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-06-23 16:36:25 -07:00
net/9p: handle correctly interrupted 9P requests
2009-04-05 16:54:53 -05:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
2009-06-11 05:47:43 -07:00
net: add NL802154 interface for configuration of 802.15.4 devices
2009-06-09 05:25:33 -07:00
irda: Add irda_skb_cb qdisc related padding
2008-12-17 15:44:58 -08:00
af_iucv: Return -EAGAIN if iucv msg limit is exceeded
2009-06-19 00:10:40 -07:00
netfilter: conntrack: optional reliable conntrack event delivery
2009-06-13 12:30:52 +02:00
netfilter: conntrack: optional reliable conntrack event delivery
2009-06-13 12:30:52 +02:00
Phonet: use per-namespace devices list
2009-01-26 21:03:35 -08:00
net: Move rx skb_orphan call to where needed
2009-06-23 16:36:25 -07:00
pkt_action: add new action skbedit
2008-09-12 16:30:20 -07:00
tipc: Remove unneeded parameter to tipc_createport_raw()
2008-07-14 22:42:19 -07:00
ipv6: Fix conflict resolutions during ipv6 binding
2009-03-24 19:49:11 -07:00
net: Fix soft lockups/OOM issues w/ unix garbage collector
2008-11-26 15:32:27 -08:00
clip: convert to internal network_device_stats
2009-01-21 14:01:59 -08:00
ax88796: Add method to take MAC from platform data
2009-03-24 23:32:03 -07:00
cfg80211: add rfkill support
2009-06-03 14:06:14 -04:00
include/net net/ - csum_partial - remove unnecessary casts
2008-11-19 15:44:53 -08:00
netlabel: Label incoming TCP connections correctly in SELinux
2009-03-28 15:01:36 +11:00
net: Use standard structures for generic socket address structures.
2008-07-19 22:35:47 -07:00
net: fix DCB setstate to return success/failure
2008-12-21 20:09:50 -08:00
decnet: compile fix for removal of byteorder wrapper
2008-11-27 23:04:13 -08:00
decnet: remove private wrappers of endian helpers
2008-11-27 00:12:47 -08:00
dsa: add switch chip cascading support
2009-03-21 19:06:54 -07:00
net: skb->dst accessors
2009-06-03 02:51:04 -07:00
net: Add support for the OpenCores 10/100 Mbps Ethernet MAC.
2009-03-27 00:16:21 -07:00
net: Remove unused parameter from fill method in fib_rules_ops.
2009-05-20 17:26:23 -07:00
netns xfrm: lookup in netns
2008-11-25 17:35:18 -08:00
vlan: Add GVRP support
2008-07-05 21:26:57 -07:00
pkt_sched: gen_estimator: Optimize gen_estimator_active()
2008-11-26 15:24:32 -08:00
genetlink: Introduce genl_register_family_with_ops()
2009-05-21 16:50:22 -07:00
mib: put icmpmsg statistics on struct net
2008-07-18 04:04:22 -07:00
wireless: radiotap updates
2009-03-27 20:12:52 -04:00
ipv6: reorder struct inet6_ifaddr to remove padding on 64 bit builds
2009-03-21 13:29:05 -07:00
net: skb->dst accessors
2009-06-03 02:51:04 -07:00
net: more #ifdef CONFIG_COMPAT
2008-08-28 02:53:51 -07:00
net: replace __constant_{endian} uses in net headers
2009-02-14 22:58:35 -08:00
inet fragments: fix sparse warning: context imbalance
2009-02-26 23:13:35 -08:00
net: skb->dst accessors
2009-06-03 02:51:04 -07:00
ipv4: New multicast-all socket option
2009-06-02 00:45:24 -07:00
net: Convert TCP & DCCP hash tables to use RCU / hlist_nulls
2008-11-16 19:40:17 -08:00
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
snmp: add missing counters for RFC 4293
2009-04-27 02:45:02 -07:00
net: skb->dst accessors
2009-06-03 02:51:04 -07:00
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
ipv4: remove unused macro (FIB_RES_RESET) from ip_fib.h.
2009-05-03 14:19:51 -07:00
net: replace __constant_{endian} uses in net headers
2009-02-14 22:58:35 -08:00
ipsec: ipcomp - Merge IPComp implementations
2008-07-25 02:54:40 -07:00
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
sit: stateless autoconf for isatap
2009-05-19 16:02:02 -07:00
snmp: add missing counters for RFC 4293
2009-04-27 02:45:02 -07:00
net: replace __constant_{endian} uses in net headers
2009-02-14 22:58:35 -08:00
wext: Emit event stream entries correctly when compat.
2008-06-16 18:50:49 -07:00
wireless: missing include in lib80211.h
2008-11-21 11:42:55 -05:00
mac80211: do not pass PS frames out of mac80211 again
2009-06-10 13:28:37 -04:00
ipv6: Fix sporadic sendmsg -EINVAL when sending to multicast groups.
2009-01-04 16:04:39 -08:00
net: Cleanup of neighbour code
2008-11-12 00:54:54 -08:00
netns: Remove net_alive
2009-03-03 01:14:27 -08:00
net_dma: convert to dma_find_channel
2009-01-06 11:38:15 -07:00
netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connections
2009-03-28 15:01:37 +11:00
netfilter: conntrack: add support for DCCP handshake sequence to ctnetlink
2009-05-27 17:50:35 +02:00
netrom: convert to internal net_device_stats
2009-01-21 14:02:01 -08:00
ematch: simpler tcf_em_unregister()
2008-11-16 23:01:49 -08:00
pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
2009-06-15 02:31:47 -07:00
ipv6: Use correct data types for ICMPv6 type and code
2009-06-23 04:31:07 -07:00
snap: use const for descriptor
2009-03-21 19:06:50 -07:00
ipv6: Use correct data types for ICMPv6 type and code
2009-06-23 04:31:07 -07:00
cfg80211: clean up includes
2009-04-22 16:57:17 -04:00
net: Fix memory leak in the proto_register function
2008-11-21 16:45:22 -08:00
rose: improving AX25 routing frames via ROSE network
2008-06-17 17:08:32 -07:00
net: skb->rtable accessor
2009-06-03 02:51:02 -07:00
net: reorder struct Qdisc for better SMP performance
2009-03-20 01:33:32 -07:00
Merge branch 'master' into next
2008-11-14 11:29:12 +11:00
snmp: add missing counters for RFC 4293
2009-04-27 02:45:02 -07:00
net: Move rx skb_orphan call to where needed
2009-06-23 16:36:25 -07:00
net: Add STP demux layer
2008-07-05 21:25:39 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-05-08 02:48:30 -07:00
net: Fix memory leak in the proto_register function
2008-11-21 16:45:22 -08:00
net: replace __constant_{endian} uses in net headers
2009-02-14 22:58:35 -08:00
ipv6: Fix NULL pointer dereference with time-wait sockets
2009-04-11 01:53:06 -07:00
udp: introduce struct udp_table and multiple spinlocks
2008-10-29 01:41:45 -07:00
wext: Dispatch and handle compat ioctls entirely in net/wireless/wext.c
2008-06-16 18:32:46 -07:00
rfkill: rewrite
2009-06-03 14:06:13 -04:00
x25: Fix sleep from timer on socket destroy.
2009-06-16 05:40:30 -07:00
ipv6: Use correct data types for ICMPv6 type and code
2009-06-23 04:31:07 -07:00
d55d87fdff