---

yaml --- r: 264058 b: refs/heads/master c: 22e83a2 h: refs/heads/master v: v3
git-mirror · Sep 20, 2011 · 0fe6ba7 · 0fe6ba7
1 parent 5b0ffc1
commit 0fe6ba7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d706f00f65146822c0097b796b3557ea8980c305
+refs/heads/master: 22e83a2926998fe132ae4dd26f1e998c70ae2e38
diff --git a/trunk/drivers/net/ppp_generic.c b/trunk/drivers/net/ppp_generic.c
@@ -1465,7 +1465,12 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
 			continue;
 		}
 
-		mtu = pch->chan->mtu - hdrlen;
+		/*
+		 * hdrlen includes the 2-byte PPP protocol field, but the
+		 * MTU counts only the payload excluding the protocol field.
+		 * (RFC1661 Section 2)
+		 */
+		mtu = pch->chan->mtu - (hdrlen - 2);
 		if (mtu < 4)
 			mtu = 4;
 		if (flen > mtu)