[PATCH -rt 5/9] net: fix mis-merge in qdisc_restart

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 <[email protected]>

---
 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

-- 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • Re: [PATCH -rt 5/9] net: fix mis-merge in qdisc_restart
    • From: Ingo Molnar <[email protected]>

• References:
  • [PATCH -rt 1/9] preempt rcu: check for underflow
    • From: Daniel Walker <[email protected]>

• Prev by Date: [PATCH -rt 1/9] preempt rcu: check for underflow
• Next by Date: [PATCH -rt 3/9] Fix jiffies wrap issue in update_times
• Previous by thread: [PATCH -rt 1/9] preempt rcu: check for underflow
• Next by thread: Re: [PATCH -rt 5/9] net: fix mis-merge in qdisc_restart
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]