diff for duplicates of <5268FCB1.7020903@katalix.com> diff --git a/a/1.txt b/N1/1.txt index 10581b2..78ca550 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,7 +52,7 @@ L2TP/IP) will be in a different namespace if the ppp interface is moved. > + /* 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); @@ -60,7 +60,7 @@ L2TP/IP) will be in a different namespace if the ppp interface is moved. > > @@ -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 63aafb0..187b6a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\05268F6CD.9070600@alphalink.fr\0" "From\0James Chapman <jchapman@katalix.com>\0" "Subject\0Re: [RFC PATCH net-next] ppp: Allow ppp device connected to an l2tp session to change of namespace\0" - "Date\0Thu, 24 Oct 2013 10:55:45 +0000\0" + "Date\0Thu, 24 Oct 2013 11:55:45 +0100\0" "To\0Fran\303\247ois Cachereul <f.cachereul@alphalink.fr>" " Paul Mackerras <paulus@samba.org>\0" "Cc\0netdev@vger.kernel.org" @@ -62,7 +62,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" @@ -70,7 +70,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" @@ -86,4 +86,4 @@ "http://www.katalix.com\n" Catalysts for your Embedded Linux software development -73013bdc7e1898571b44b943fafc3821669641d11e9baa36d3041fb67a648fbc +8460973005e7245c0fc9a52310f1b9e291a603101e7b6e1b61bfad70465ffb20
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.