Messages in this thread | | | Date | Sat, 23 Nov 2002 19:25:47 +0100 | From | Stephan von Krawczynski <> | Subject | Re: Hard Lockup with 2.4.20-rc3 and ISDN (ippp) |
| |
On Sat, 23 Nov 2002 09:12:21 -0600 (CST) Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> wrote:
> Yup, my bad. Could you confirm that the attached patch which I sent to > Marcelo already fixes it?
Hello Kai, hello Marcelo,
I can confirm that below patch you sent fixes the lockup issue that came up with rc3.
Regards, Stephan
> ----------------------------------------------------------------------------- > ChangeSet@1.795.1.2, 2002-11-22 15:24:43-06:00, kai@tp1.ruhr-uni-bochum.de > ISDN: Fix the fix > > Argh, I must have been asleep or something. The original patch by Herbert > Xu was right, I extended it to cover more error paths and broke it in > doing so. Now fixed again. > > > --------------------------------------------------------------------------- > > diff -Nru a/drivers/isdn/isdn_ppp.c b/drivers/isdn/isdn_ppp.c > --- a/drivers/isdn/isdn_ppp.c Fri Nov 22 15:29:42 2002 > +++ b/drivers/isdn/isdn_ppp.c Fri Nov 22 15:29:42 2002 > @@ -1147,7 +1147,7 @@ > printk(KERN_ERR "isdn_ppp_xmit: lp->ppp_slot(%d)\n", > mlp->ppp_slot); > kfree_skb(skb); > - goto unlock; > + goto out; > } > ipts = ippp_table[slot]; > > @@ -1155,7 +1155,7 @@ > if (ipts->debug & 0x1) > printk(KERN_INFO "%s: IP frame delayed.\n", netdev->name); > retval = 1; > - goto unlock; > + goto out; > } > > switch (ntohs(skb->protocol)) { > @@ -1169,7 +1169,7 @@ > printk(KERN_ERR "isdn_ppp: skipped unsupported protocol: > %#x.\n", > skb->protocol); > dev_kfree_skb(skb); > - goto unlock; > + goto out; > } > > lp = isdn_net_get_locked_lp(nd); > @@ -1336,6 +1336,7 @@ > > unlock: > spin_unlock_bh(&lp->xmit_lock); > + out: > return retval; > } > - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |