From 35b5dac854b096e2bce7347ac58d235a72438423 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 10 Sep 2010 01:58:10 +0000
Subject: [PATCH] --- yaml --- r: 210803 b: refs/heads/master c:
 3429769bc67c7a48b3c01b2452b32171b3450202 h: refs/heads/master i:   210801:
 d2e498de667699c7badead4eacd5702f2403e763   210799:
 7e1d9f248bf45295e586ef995ab339f4cfcf9bf3 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/ppp_generic.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 21692e18d596..504263a9b822 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 339db11b219f36cf7da61b390992d95bb6b7ba2e
+refs/heads/master: 3429769bc67c7a48b3c01b2452b32171b3450202
diff --git a/trunk/drivers/net/ppp_generic.c b/trunk/drivers/net/ppp_generic.c
index 6695a51e09e9..736b91703b3e 100644
--- a/trunk/drivers/net/ppp_generic.c
+++ b/trunk/drivers/net/ppp_generic.c
@@ -1314,8 +1314,13 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
 	hdrlen = (ppp->flags & SC_MP_XSHORTSEQ)? MPHDRLEN_SSN: MPHDRLEN;
 	i = 0;
 	list_for_each_entry(pch, &ppp->channels, clist) {
-		navail += pch->avail = (pch->chan != NULL);
-		pch->speed = pch->chan->speed;
+		if (pch->chan) {
+			pch->avail = 1;
+			navail++;
+			pch->speed = pch->chan->speed;
+		} else {
+			pch->avail = 0;
+		}
 		if (pch->avail) {
 			if (skb_queue_empty(&pch->file.xq) ||
 				!pch->had_frag) {