diff for duplicates of <20120708214930.GI19462@kvack.org> diff --git a/a/1.txt b/N1/1.txt index 9c60d62..b4d9808 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,7 +57,7 @@ index 5c05572..9c12712 100644 + if (get_user(val, p)) + break; + err = 0; -+ if (ppp->multihop_if && (val = -1)) { ++ if (ppp->multihop_if && (val == -1)) { + struct net_device *dev = ppp->multihop_if; + ppp->multihop_if = NULL; + dev_put(dev); @@ -82,7 +82,7 @@ index 5c05572..9c12712 100644 int npi, proto; unsigned char *pp; -+ if (skb->protocol = htons(ETH_P_PPP)) ++ if (skb->protocol == htons(ETH_P_PPP)) + goto queue; + npi = ethertype_to_npindex(ntohs(skb->protocol)); @@ -100,7 +100,7 @@ index 5c05572..9c12712 100644 int len; unsigned char *cp; -+ if (skb->protocol = htons(ETH_P_PPP)) ++ if (skb->protocol == htons(ETH_P_PPP)) + goto xmit; + if (proto < 0x8000) { @@ -118,9 +118,9 @@ index 5c05572..9c12712 100644 return; } -- if ((ppp->flags & SC_MULTILINK) = 0) { -+ if (((ppp->flags & SC_MULTILINK) = 0) || -+ (skb->protocol = htons(ETH_P_PPP))) { +- if ((ppp->flags & SC_MULTILINK) == 0) { ++ if (((ppp->flags & SC_MULTILINK) == 0) || ++ (skb->protocol == htons(ETH_P_PPP))) { /* not doing multilink: send it down the first channel */ list = list->next; pch = list_entry(list, struct channel, clist); @@ -137,7 +137,7 @@ index 5c05572..9c12712 100644 + } + proto = PPP_PROTO(skb); - if (!pch->ppp || proto >= 0xc000 || proto = PPP_CCPFRAG) { + if (!pch->ppp || proto >= 0xc000 || proto == PPP_CCPFRAG) { /* put it on the channel queue */ @@ -2715,8 +2757,12 @@ static void ppp_shutdown_interface(struct ppp *ppp) /* This will call dev_close() for us. */ diff --git a/a/content_digest b/N1/content_digest index 5a70c25..7d11d95 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Benjamin LaHaise <bcrl@kvack.org>\0" "Subject\0[RFC PATCH] ppp: add support for L2 multihop / tunnel switching\0" - "Date\0Sun, 08 Jul 2012 21:49:30 +0000\0" + "Date\0Sun, 8 Jul 2012 17:49:30 -0400\0" "To\0netdev@vger.kernel.org" " linux-ppp@vger.kernel.org\0" "\00:1\0" @@ -64,7 +64,7 @@ "+\t\tif (get_user(val, p))\n" "+\t\t\tbreak;\n" "+\t\terr = 0;\n" - "+\t\tif (ppp->multihop_if && (val = -1)) {\n" + "+\t\tif (ppp->multihop_if && (val == -1)) {\n" "+\t\t\tstruct net_device *dev = ppp->multihop_if;\n" "+\t\t\tppp->multihop_if = NULL;\n" "+\t\t\tdev_put(dev);\n" @@ -89,7 +89,7 @@ " \tint npi, proto;\n" " \tunsigned char *pp;\n" " \n" - "+\tif (skb->protocol = htons(ETH_P_PPP))\n" + "+\tif (skb->protocol == htons(ETH_P_PPP))\n" "+\t\tgoto queue;\n" "+\n" " \tnpi = ethertype_to_npindex(ntohs(skb->protocol));\n" @@ -107,7 +107,7 @@ " \tint len;\n" " \tunsigned char *cp;\n" " \n" - "+\tif (skb->protocol = htons(ETH_P_PPP))\n" + "+\tif (skb->protocol == htons(ETH_P_PPP))\n" "+\t\tgoto xmit;\n" "+\n" " \tif (proto < 0x8000) {\n" @@ -125,9 +125,9 @@ " \t\treturn;\n" " \t}\n" " \n" - "-\tif ((ppp->flags & SC_MULTILINK) = 0) {\n" - "+\tif (((ppp->flags & SC_MULTILINK) = 0) ||\n" - "+\t (skb->protocol = htons(ETH_P_PPP))) {\n" + "-\tif ((ppp->flags & SC_MULTILINK) == 0) {\n" + "+\tif (((ppp->flags & SC_MULTILINK) == 0) ||\n" + "+\t (skb->protocol == htons(ETH_P_PPP))) {\n" " \t\t/* not doing multilink: send it down the first channel */\n" " \t\tlist = list->next;\n" " \t\tpch = list_entry(list, struct channel, clist);\n" @@ -144,7 +144,7 @@ "+\t}\n" "+\n" " \tproto = PPP_PROTO(skb);\n" - " \tif (!pch->ppp || proto >= 0xc000 || proto = PPP_CCPFRAG) {\n" + " \tif (!pch->ppp || proto >= 0xc000 || proto == PPP_CCPFRAG) {\n" " \t\t/* put it on the channel queue */\n" "@@ -2715,8 +2757,12 @@ static void ppp_shutdown_interface(struct ppp *ppp)\n" " \t/* This will call dev_close() for us. */\n" @@ -198,4 +198,4 @@ "-- \n" "\"Thought is the essence of where you are now.\"" -419d072ef604086050799feaacbf8f104c8c14ebd9dfb7d01a043b3dbbd5685b +869741515cebe372b0381b81fae9d6f3641c94e726ad9ddb249c3f7ae10cad8a
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.