aboutsummaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2015-01-26 22:28:13 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-03-06 00:39:18 +0000
commiteac943e2197b01ae12dd1bbbcf1b7dfb5801f868 (patch)
treefe55f809762b05683a6463f452a58d765fd603b6 /net/caif
parent818fbf0b9ed36ab58405662d137ab27c5c82140b (diff)
downloadkernel_samsung_smdk4412-eac943e2197b01ae12dd1bbbcf1b7dfb5801f868.zip
kernel_samsung_smdk4412-eac943e2197b01ae12dd1bbbcf1b7dfb5801f868.tar.gz
kernel_samsung_smdk4412-eac943e2197b01ae12dd1bbbcf1b7dfb5801f868.tar.bz2
caif: remove wrong dev_net_set() call
commit 8997c27ec41127bf57421cc0205413d525421ddc upstream. 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> [bwh: Backported to 3.2: drop the change to caif_hsi change] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/caif')
-rw-r--r--net/caif/chnl_net.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
index 8656909..b525aec 100644
--- a/net/caif/chnl_net.c
+++ b/net/caif/chnl_net.c
@@ -464,7 +464,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)