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@xxxxxxxxxx> --- 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-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
