diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 10:51:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 10:51:40 -0400 |
| commit | d5a92dd43739f59f77247cfbcbefd229e2948131 (patch) | |
| tree | a16124c41e4da74c2a5f8edbd278b96e9d295c71 /net/sched/sch_netem.c | |
| parent | d0b72a0817b0164986d35366c8ffe92fd985f713 (diff) | |
| parent | 4e8a5201506423e0241202de1349422af4260296 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[PKT_SCHED] netem: Orphan SKB when adding to queue.
[NET]: kernel-doc fix for sock.h
[NET]: Reduce sizeof(struct flowi) by 20 bytes.
[IPv6] fib: initialize tb6_lock in common place to give lockdep a key
[ATM] nicstar: Fix a bogus casting warning
[ATM] firestream: handle thrown error
[ATM]: No need to return void
[ATM]: handle sysfs errors
[DCCP] ipv6: Fix opt_skb leak.
[DCCP]: Fix Oops in DCCPv6
Diffstat (limited to 'net/sched/sch_netem.c')
| -rw-r--r-- | net/sched/sch_netem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 45939bafbdf8..ef8874babf6a 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
| @@ -170,6 +170,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
| 170 | return NET_XMIT_BYPASS; | 170 | return NET_XMIT_BYPASS; |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | skb_orphan(skb); | ||
| 174 | |||
| 173 | /* | 175 | /* |
| 174 | * If we need to duplicate packet, then re-insert at top of the | 176 | * If we need to duplicate packet, then re-insert at top of the |
| 175 | * qdisc tree, since parent queuer expects that only one | 177 | * qdisc tree, since parent queuer expects that only one |