patch-2.4.2 linux/drivers/net/ppp_generic.c

• Lines: 35
• Date: Sun Feb 4 10:05:30 2001
• Orig file: v2.4.1/linux/drivers/net/ppp_generic.c
• Orig date: Tue Nov 28 21:53:45 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/ppp_generic.c linux/drivers/net/ppp_generic.c
@@ -1412,6 +1412,7 @@
 			skb->protocol = htons(npindex_to_ethertype[npi]);
 			skb->mac.raw = skb->data;
 			netif_rx(skb);
+			ppp->dev->last_rx = jiffies;
 		}
 	}
 	return;
@@ -2342,7 +2343,7 @@
 	write_lock_bh(&pch->upl);
 	ret = -EINVAL;
 	if (pch->ppp != 0)
-		goto outw;
+		goto outwl;
 	ppp_lock(ppp);
 	spin_lock_bh(&pch->downl);
 	if (pch->chan == 0)		/* need to check this?? */
@@ -2361,7 +2362,7 @@
  outr:
 	spin_unlock_bh(&pch->downl);
 	ppp_unlock(ppp);
- outw:
+ outwl:
 	write_unlock_bh(&pch->upl);
  out:
 	spin_unlock(&all_ppp_lock);
@@ -2408,7 +2409,7 @@
 	kfree(pch);
 }
 
-void __exit ppp_cleanup(void)
+static void __exit ppp_cleanup(void)
 {
 	/* should never happen */
 	if (!list_empty(&all_ppp_units) || !list_empty(&all_channels))