From: Daniel Walker <dwalker@mvista.com>
To: mingo@elte.hu
Cc: linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org
Subject: [PATCH -rt 5/9] net: fix mis-merge in qdisc_restart
Date: Sun, 29 Jul 2007 19:45:39 -0700 [thread overview]
Message-ID: <20070730024720.116454959@mvista.com> (raw)
In-Reply-To: 20070730024534.369897977@mvista.com
[-- Attachment #1: preempt-realtime-net-mismerge.patch --]
[-- Type: text/plain, Size: 747 bytes --]
This mismerge caused my networking to malfunction. The interface would
come up, but no traffic would make it in/out ..
Signed-off-by: Daniel Walker <dwalker@mvista.com>
---
net/sched/sch_generic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.22/net/sched/sch_generic.c
===================================================================
--- linux-2.6.22.orig/net/sched/sch_generic.c
+++ linux-2.6.22/net/sched/sch_generic.c
@@ -156,7 +156,7 @@ static inline int qdisc_restart(struct n
#ifdef CONFIG_PREEMPT_RT
netif_tx_lock(dev);
#else
- if (netif_tx_trylock(dev))
+ if (!netif_tx_trylock(dev))
/* Another CPU grabbed the driver tx lock */
return handle_dev_cpu_collision(skb, dev, q);
#endif
--
next prev parent reply other threads:[~2007-07-30 2:47 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-30 2:45 [PATCH -rt 1/9] preempt rcu: check for underflow Daniel Walker
2007-07-30 2:45 ` [PATCH -rt 2/9] Dont allow non-threaded softirqs and threaded hardirqs Daniel Walker
2007-07-30 9:23 ` Ingo Molnar
2007-07-30 11:28 ` Steven Rostedt
2007-07-30 2:45 ` [PATCH -rt 3/9] Fix jiffies wrap issue in update_times Daniel Walker
2007-07-30 9:25 ` Ingo Molnar
2007-07-30 2:45 ` [PATCH -rt 4/9] ifdef raise_softirq_irqoff wakeup Daniel Walker
2007-07-30 9:27 ` Ingo Molnar
2007-07-30 15:48 ` Daniel Walker
2007-08-06 7:20 ` Ingo Molnar
2007-07-30 2:45 ` Daniel Walker [this message]
2007-07-30 9:30 ` [PATCH -rt 5/9] net: fix mis-merge in qdisc_restart Ingo Molnar
2007-07-30 2:45 ` [PATCH -rt 6/9] spinlock/rt_lock random cleanups Daniel Walker
2007-07-30 4:58 ` Ankita Garg
2007-07-30 15:48 ` Daniel Walker
2007-07-30 9:31 ` Ingo Molnar
2007-07-30 2:45 ` [PATCH -rt 7/9] introduce PICK_FUNCTION Daniel Walker
2007-07-30 9:39 ` Peter Zijlstra
2007-07-30 16:16 ` Daniel Walker
2007-07-30 2:45 ` [PATCH -rt 8/9] spinlocks/rwlocks: use PICK_FUNCTION() Daniel Walker
2007-07-30 2:45 ` [PATCH -rt 9/9] seqlocks: use PICK_FUNCTION Daniel Walker
2007-08-06 7:21 ` Ingo Molnar
2007-08-08 19:40 ` Daniel Walker
2007-07-30 5:26 ` [PATCH -rt 1/9] preempt rcu: check for underflow Paul E. McKenney
2007-07-30 9:22 ` Ingo Molnar
2007-07-30 15:48 ` Daniel Walker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070730024720.116454959@mvista.com \
--to=dwalker@mvista.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox