diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-19 11:05:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-19 11:05:50 -0700 |
| commit | 7d7dee96e1a7369eae67e5fe5c987785a1c11e40 (patch) | |
| tree | 7c87df02117c7c3ac2ab4b7bd594a2183ec22ff6 /net/sched | |
| parent | f1c9c9797a7c519a70b8e4607f41d97ec59fc8f0 (diff) | |
| parent | 4e8cec269dd9e823804141f25ce37c23e72d3c12 (diff) | |
| download | kernel_samsung_aries-7d7dee96e1a7369eae67e5fe5c987785a1c11e40.zip kernel_samsung_aries-7d7dee96e1a7369eae67e5fe5c987785a1c11e40.tar.gz kernel_samsung_aries-7d7dee96e1a7369eae67e5fe5c987785a1c11e40.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
dca: disable dca on IOAT ver.3.0 multiple-IOH platforms
netpoll: Disable IRQ around RCU dereference in netpoll_rx
sctp: Do not reset the packet during sctp_packet_config().
net/llc: storing negative error codes in unsigned short
MAINTAINERS: move atlx discussions to netdev
drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory
drivers/net/eql.c: prevent reading uninitialized stack memory
drivers/net/usb/hso.c: prevent reading uninitialized memory
xfrm: dont assume rcu_read_lock in xfrm_output_one()
r8169: Handle rxfifo errors on 8168 chips
3c59x: Remove atomic context inside vortex_{set|get}_wol
tcp: Prevent overzealous packetization by SWS logic.
net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS
phylib: fix PAL state machine restart on resume
net: use rcu_barrier() in rollback_registered_many
bonding: correctly process non-linear skbs
ipv4: enable getsockopt() for IP_NODEFRAG
ipv4: force_igmp_version ignored when a IGMPv3 query received
ppp: potential NULL dereference in ppp_mp_explode()
net/llc: make opt unsigned in llc_ui_setsockopt()
...
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_atm.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 3406627..6318e11 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -255,10 +255,6 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent, error = -EINVAL; goto err_out; } - if (!list_empty(&flow->list)) { - error = -EEXIST; - goto err_out; - } } else { int i; unsigned long cl; |