diff for duplicates of <20100301145915.2ecaac89@nehalam> diff --git a/a/1.txt b/N1/1.txt index 5a8b1bc..2bfa5c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -139,8 +139,8 @@ Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> } else { - ppp->npmode[i] = npi.mode; +#ifdef CONFIG_PPP_BCP -+ if (i == NP_BRIDGE) { -+ if (npi.mode == NPMODE_PASS) { ++ if (i = NP_BRIDGE) { ++ if (npi.mode = NPMODE_PASS) { + err = ppp_create_bcp(ppp); + if (err < 0) + break; @@ -285,7 +285,7 @@ Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> #endif /* CONFIG_PPP_FILTER */ ppp->last_recv = jiffies; -- if ((ppp->dev->flags & IFF_UP) == 0 || +- if ((ppp->dev->flags & IFF_UP) = 0 || - ppp->npmode[npi] != NPMODE_PASS) { - kfree_skb(skb); - } else { @@ -293,7 +293,7 @@ Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> - skb_pull_rcsum(skb, 2); - skb->dev = ppp->dev; +#ifdef CONFIG_PPP_BCP -+ if (npi == NP_BRIDGE || npi == NP_BPDU_IEEE) ++ if (npi = NP_BRIDGE || npi = NP_BPDU_IEEE) + rxdev = ppp->bcp; + else +#endif @@ -388,7 +388,7 @@ Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> + + rtnl_lock(); + ret = register_netdevice(dev); -+ if (ret == 0) ++ if (ret = 0) + ppp->bcp = dev; + rtnl_unlock(); + @@ -502,11 +502,11 @@ Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> + * obsolete manner of RFC 1638, do it. Otherwise, send it + * like any other packet. + */ -+ if ((ppp->npmode[NP_BPDU_IEEE] == NPMODE_PASS) && ++ if ((ppp->npmode[NP_BPDU_IEEE] = NPMODE_PASS) && + pskb_may_pull(skb, ETH_HLEN + sizeof(ieee_8021d_8023_hdr)) && -+ compare_ether_addr(skb->data, ieee_8021d_dstaddr) == 0 && ++ compare_ether_addr(skb->data, ieee_8021d_dstaddr) = 0 && + memcmp(skb->data + ETH_HLEN, ieee_8021d_8023_hdr, -+ sizeof(ieee_8021d_8023_hdr)) == 0) { ++ sizeof(ieee_8021d_8023_hdr)) = 0) { + skb = bpdu_ieee_encap(skb, dev); + npi = NP_BPDU_IEEE; + } else { diff --git a/a/content_digest b/N1/content_digest index 634de28..04f3525 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,13 @@ "From\0Stephen Hemminger <shemminger@vyatta.com>\0" - "Subject\0[Bridge] [RFC] ppp: Bridge Control Protocol\0" - "Date\0Mon, 1 Mar 2010 14:59:15 -0800\0" + "Subject\0[RFC] ppp: Bridge Control Protocol\0" + "Date\0Mon, 01 Mar 2010 22:59:15 +0000\0" "To\0David@mail.vyatta.com" Miller <davem@davemloft.net " Paul Mackerras <paulus@samba.org>\0" "Cc\0linux-ppp@vger.kernel.org" bridge@linux-foundation.org - dane@aiinet.com - " netdev@vger.kernel.org\0" + netdev@vger.kernel.org + " dane@aiinet.com\0" "\00:1\0" "b\0" "This is a port of an old patch to provide BCP support.\n" @@ -151,8 +151,8 @@ " \t\t} else {\n" "-\t\t\tppp->npmode[i] = npi.mode;\n" "+#ifdef CONFIG_PPP_BCP\n" - "+\t\t\tif (i == NP_BRIDGE) {\n" - "+\t\t\t\tif (npi.mode == NPMODE_PASS) {\n" + "+\t\t\tif (i = NP_BRIDGE) {\n" + "+\t\t\t\tif (npi.mode = NPMODE_PASS) {\n" "+\t\t\t\t\terr = ppp_create_bcp(ppp);\n" "+\t\t\t\t\tif (err < 0)\n" "+\t\t\t\t\t\tbreak;\n" @@ -297,7 +297,7 @@ " #endif /* CONFIG_PPP_FILTER */\n" " \t\t\tppp->last_recv = jiffies;\n" " \n" - "-\t\tif ((ppp->dev->flags & IFF_UP) == 0 ||\n" + "-\t\tif ((ppp->dev->flags & IFF_UP) = 0 ||\n" "-\t\t ppp->npmode[npi] != NPMODE_PASS) {\n" "-\t\t\tkfree_skb(skb);\n" "-\t\t} else {\n" @@ -305,7 +305,7 @@ "-\t\t\tskb_pull_rcsum(skb, 2);\n" "-\t\t\tskb->dev = ppp->dev;\n" "+#ifdef CONFIG_PPP_BCP\n" - "+\t\tif (npi == NP_BRIDGE || npi == NP_BPDU_IEEE)\n" + "+\t\tif (npi = NP_BRIDGE || npi = NP_BPDU_IEEE)\n" "+\t\t\trxdev = ppp->bcp;\n" "+\t\telse\n" "+#endif\n" @@ -400,7 +400,7 @@ "+\n" "+\trtnl_lock();\n" "+\tret = register_netdevice(dev);\n" - "+\tif (ret == 0)\n" + "+\tif (ret = 0)\n" "+\t\tppp->bcp = dev;\n" "+\trtnl_unlock();\n" "+\n" @@ -514,11 +514,11 @@ "+\t * obsolete manner of RFC 1638, do it. Otherwise, send it\n" "+\t * like any other packet.\n" "+\t */\n" - "+\tif ((ppp->npmode[NP_BPDU_IEEE] == NPMODE_PASS) &&\n" + "+\tif ((ppp->npmode[NP_BPDU_IEEE] = NPMODE_PASS) &&\n" "+\t pskb_may_pull(skb, ETH_HLEN + sizeof(ieee_8021d_8023_hdr)) &&\n" - "+\t compare_ether_addr(skb->data, ieee_8021d_dstaddr) == 0 &&\n" + "+\t compare_ether_addr(skb->data, ieee_8021d_dstaddr) = 0 &&\n" "+\t memcmp(skb->data + ETH_HLEN, ieee_8021d_8023_hdr,\n" - "+\t\t sizeof(ieee_8021d_8023_hdr)) == 0) {\n" + "+\t\t sizeof(ieee_8021d_8023_hdr)) = 0) {\n" "+\t\tskb = bpdu_ieee_encap(skb, dev);\n" "+\t\tnpi = NP_BPDU_IEEE;\n" "+\t} else {\n" @@ -561,4 +561,4 @@ " \ttristate \"SLIP (serial line) support\"\n" " \t---help---" -eff30468855e535d6d7b745cdb8cd71e2a26d71c86e1c810a079124c29e9aed5 +56ad847915c2627a3a6fa5323c56725cfd56490df48ddf285450ebf6933a9c6a
diff --git a/a/content_digest b/N2/content_digest index 634de28..71bbe91 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,13 @@ "From\0Stephen Hemminger <shemminger@vyatta.com>\0" - "Subject\0[Bridge] [RFC] ppp: Bridge Control Protocol\0" + "Subject\0[RFC] ppp: Bridge Control Protocol\0" "Date\0Mon, 1 Mar 2010 14:59:15 -0800\0" "To\0David@mail.vyatta.com" Miller <davem@davemloft.net " Paul Mackerras <paulus@samba.org>\0" "Cc\0linux-ppp@vger.kernel.org" bridge@linux-foundation.org - dane@aiinet.com - " netdev@vger.kernel.org\0" + netdev@vger.kernel.org + " dane@aiinet.com\0" "\00:1\0" "b\0" "This is a port of an old patch to provide BCP support.\n" @@ -561,4 +561,4 @@ " \ttristate \"SLIP (serial line) support\"\n" " \t---help---" -eff30468855e535d6d7b745cdb8cd71e2a26d71c86e1c810a079124c29e9aed5 +66040607de9703117c122c785f8b11bb0e2828529233ff704e77d8399e397ef0
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.