diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-01-26 22:28:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-29 14:20:02 -0800 |
| commit | 8997c27ec41127bf57421cc0205413d525421ddc (patch) | |
| tree | 71d667cca937d52492c4587c4d45f8cd2f2beaf3 | |
| parent | 9ce357795ef208faa0d59894d9d119a7434e37f3 (diff) | |
| download | linux-8997c27ec41127bf57421cc0205413d525421ddc.tar.gz linux-8997c27ec41127bf57421cc0205413d525421ddc.tar.bz2 linux-8997c27ec41127bf57421cc0205413d525421ddc.zip | |
caif: remove wrong dev_net_set() call
src_net points to the netns where the netlink message has been received. This
netns may be different from the netns where the interface is created (because
the user may add IFLA_NET_NS_[PID|FD]). In this case, src_net is the link netns.
It seems wrong to override the netns in the newlink() handler because if it
was not already src_net, it means that the user explicitly asks to create the
netdevice in another netns.
CC: Sjur Brændeland <sjur.brandeland@stericsson.com>
CC: Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
Fixes: 8391c4aab1aa ("caif: Bugfixes in CAIF netdevice for close and flow control")
Fixes: c41254006377 ("caif-hsi: Add rtnl support")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/caif/caif_hsi.c | 1 | ||||
| -rw-r--r-- | net/caif/chnl_net.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 5e40a8b68cbe..b3b922adc0e4 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c @@ -1415,7 +1415,6 @@ static int caif_hsi_newlink(struct net *src_net, struct net_device *dev, cfhsi = netdev_priv(dev); cfhsi_netlink_parms(data, cfhsi); - dev_net_set(cfhsi->ndev, src_net); get_ops = symbol_get(cfhsi_get_ops); if (!get_ops) { diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 4589ff67bfa9..67a4a36febd1 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -470,7 +470,6 @@ static int ipcaif_newlink(struct net *src_net, struct net_device *dev, ASSERT_RTNL(); caifdev = netdev_priv(dev); caif_netlink_parms(data, &caifdev->conn_req); - dev_net_set(caifdev->netdev, src_net); ret = register_netdevice(dev); if (ret) |