diff for duplicates of <20101220195833.26786ec5@nehalam> diff --git a/a/1.txt b/N1/1.txt index e8ded9c..da1665a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ This is most likely a bug in that version of IOS, since it is fixed in later versions. As a workaround this patch allows a module parameter to be set to disable compressing the protocol ID. -See: https://bugzilla.vyatta.com/show_bug.cgi?id979 +See: https://bugzilla.vyatta.com/show_bug.cgi?id=3979 RFC 1990 allows an implementation to formulate MP fragments as if protocol compression had been negotiated. This allows us to always send compressed @@ -34,15 +34,15 @@ Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> * Divide a packet to be transmitted into fragments and * send them out the individual links. @@ -1345,10 +1350,10 @@ static int ppp_mp_explode(struct ppp *pp - if (nfree = 0 || nfree < navail / 2) + if (nfree == 0 || nfree < navail / 2) return 0; /* can't take now, leave it in xmit_pending */ - /* Do protocol field compression (XXX this should be optional) */ + /* Do protocol field compression */ p = skb->data; len = skb->len; -- if (*p = 0) { -+ if (*p = 0 && mp_protocol_compress) { +- if (*p == 0) { ++ if (*p == 0 && mp_protocol_compress) { ++p; --len; } diff --git a/a/content_digest b/N1/content_digest index f7d8910..2c3d730 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Stephen Hemminger <shemminger@vyatta.com>\0" "Subject\0[PATCH] ppp: allow disabling multilink protocol ID compression\0" - "Date\0Tue, 21 Dec 2010 03:58:33 +0000\0" + "Date\0Mon, 20 Dec 2010 19:58:33 -0800\0" "To\0Paul Mackerras <paulus@samba.org>\0" "Cc\0linux-ppp@vger.kernel.org" " netdev@vger.kernel.org\0" @@ -11,7 +11,7 @@ "in later versions. As a workaround this patch allows a module parameter\n" "to be set to disable compressing the protocol ID.\n" "\n" - "See: https://bugzilla.vyatta.com/show_bug.cgi?id979\n" + "See: https://bugzilla.vyatta.com/show_bug.cgi?id=3979\n" "\n" "RFC 1990 allows an implementation to formulate MP fragments as if protocol\n" "compression had been negotiated. This allows us to always send compressed\n" @@ -42,17 +42,17 @@ " * Divide a packet to be transmitted into fragments and\n" " * send them out the individual links.\n" "@@ -1345,10 +1350,10 @@ static int ppp_mp_explode(struct ppp *pp\n" - " \tif (nfree = 0 || nfree < navail / 2)\n" + " \tif (nfree == 0 || nfree < navail / 2)\n" " \t\treturn 0; /* can't take now, leave it in xmit_pending */\n" " \n" "-\t/* Do protocol field compression (XXX this should be optional) */\n" "+\t/* Do protocol field compression */\n" " \tp = skb->data;\n" " \tlen = skb->len;\n" - "-\tif (*p = 0) {\n" - "+\tif (*p = 0 && mp_protocol_compress) {\n" + "-\tif (*p == 0) {\n" + "+\tif (*p == 0 && mp_protocol_compress) {\n" " \t\t++p;\n" " \t\t--len;\n" " \t}" -1322a34e16086a2e1f2bddb1bc955092af71961eb7bf6be6c7cf5e9c1506999c +f102e45e7ff7e4f0ba2015e55e78e72f72d91a994fd55a3a7ba7edb91fccb53b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.