diff for duplicates of <5268F6CD.9070600@alphalink.fr> diff --git a/a/1.txt b/N1/1.txt index 74c2343..4ed372e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -47,7 +47,7 @@ index 72ff14b..7ccf2ae 100644 + /* allow ppp net device to be moved in another network namespace + * if it's connected to an l2tp session */ + sk = (struct sock *)pch->chan->private; -+ if (sk && sk->sk_protocol = PX_PROTO_OL2TP) ++ if (sk && sk->sk_protocol == PX_PROTO_OL2TP) + ppp->dev->features &= ~NETIF_F_NETNS_LOCAL; + ppp_unlock(ppp); @@ -55,7 +55,7 @@ index 72ff14b..7ccf2ae 100644 @@ -2912,6 +2922,7 @@ ppp_disconnect_channel(struct channel *pch) list_del(&pch->clist); - if (--ppp->n_channels = 0) + if (--ppp->n_channels == 0) wake_up_interruptible(&ppp->file.rwait); + ppp->dev->features |= NETIF_F_NETNS_LOCAL; ppp_unlock(ppp); diff --git a/a/content_digest b/N1/content_digest index fc48357..d329119 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Fran\303\247ois Cachereul <f.cachereul@alphalink.fr>\0" "Subject\0[RFC PATCH net-next] ppp: Allow ppp device connected to an l2tp session to change of namespace\0" - "Date\0Thu, 24 Oct 2013 10:30:37 +0000\0" + "Date\0Thu, 24 Oct 2013 12:30:37 +0200\0" "To\0Paul Mackerras <paulus@samba.org>" " James Chapman <jchapman@katalix.com>\0" "Cc\0netdev@vger.kernel.org" @@ -56,7 +56,7 @@ "+\t/* allow ppp net device to be moved in another network namespace\n" "+\t * if it's connected to an l2tp session */\n" "+\tsk = (struct sock *)pch->chan->private;\n" - "+\tif (sk && sk->sk_protocol = PX_PROTO_OL2TP)\n" + "+\tif (sk && sk->sk_protocol == PX_PROTO_OL2TP)\n" "+\t\tppp->dev->features &= ~NETIF_F_NETNS_LOCAL;\n" "+\n" " \tppp_unlock(ppp);\n" @@ -64,7 +64,7 @@ " \n" "@@ -2912,6 +2922,7 @@ ppp_disconnect_channel(struct channel *pch)\n" " \t\tlist_del(&pch->clist);\n" - " \t\tif (--ppp->n_channels = 0)\n" + " \t\tif (--ppp->n_channels == 0)\n" " \t\t\twake_up_interruptible(&ppp->file.rwait);\n" "+\t\tppp->dev->features |= NETIF_F_NETNS_LOCAL;\n" " \t\tppp_unlock(ppp);\n" @@ -73,4 +73,4 @@ "-- \n" 1.7.10.4 -0e7aa2ff63a275df3a6d0450ea23448238f769137bd0022dbb08d957b574ab14 +ecd2a26f10489d2c9143d8a23ac9d67b109adceeb398ea0d5101aaa1886540b3
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.