aboutsummaryrefslogtreecommitdiffstats
path: root/net/caif/chnl_net.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/caif/chnl_net.c')
-rw-r--r--net/caif/chnl_net.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
index 9ef8f1660ee1..1a3398a89aee 100644
--- a/net/caif/chnl_net.c
+++ b/net/caif/chnl_net.c
@@ -20,7 +20,6 @@
20#include <linux/caif/if_caif.h> 20#include <linux/caif/if_caif.h>
21#include <net/rtnetlink.h> 21#include <net/rtnetlink.h>
22#include <net/caif/caif_layer.h> 22#include <net/caif/caif_layer.h>
23#include <net/caif/cfcnfg.h>
24#include <net/caif/cfpkt.h> 23#include <net/caif/cfpkt.h>
25#include <net/caif/caif_dev.h> 24#include <net/caif/caif_dev.h>
26 25
@@ -270,8 +269,9 @@ static int chnl_net_open(struct net_device *dev)
270 269
271 if (priv->state != CAIF_CONNECTING) { 270 if (priv->state != CAIF_CONNECTING) {
272 priv->state = CAIF_CONNECTING; 271 priv->state = CAIF_CONNECTING;
273 result = caif_connect_client(&priv->conn_req, &priv->chnl, 272 result = caif_connect_client(dev_net(dev), &priv->conn_req,
274 &llifindex, &headroom, &tailroom); 273 &priv->chnl, &llifindex,
274 &headroom, &tailroom);
275 if (result != 0) { 275 if (result != 0) {
276 pr_debug("err: " 276 pr_debug("err: "
277 "Unable to register and open device," 277 "Unable to register and open device,"
@@ -327,7 +327,7 @@ static int chnl_net_open(struct net_device *dev)
327 327
328 if (result == 0) { 328 if (result == 0) {
329 pr_debug("connect timeout\n"); 329 pr_debug("connect timeout\n");
330 caif_disconnect_client(&priv->chnl); 330 caif_disconnect_client(dev_net(dev), &priv->chnl);
331 priv->state = CAIF_DISCONNECTED; 331 priv->state = CAIF_DISCONNECTED;
332 pr_debug("state disconnected\n"); 332 pr_debug("state disconnected\n");
333 result = -ETIMEDOUT; 333 result = -ETIMEDOUT;
@@ -343,7 +343,7 @@ static int chnl_net_open(struct net_device *dev)
343 return 0; 343 return 0;
344 344
345error: 345error:
346 caif_disconnect_client(&priv->chnl); 346 caif_disconnect_client(dev_net(dev), &priv->chnl);
347 priv->state = CAIF_DISCONNECTED; 347 priv->state = CAIF_DISCONNECTED;
348 pr_debug("state disconnected\n"); 348 pr_debug("state disconnected\n");
349 return result; 349 return result;
@@ -357,7 +357,7 @@ static int chnl_net_stop(struct net_device *dev)
357 ASSERT_RTNL(); 357 ASSERT_RTNL();
358 priv = netdev_priv(dev); 358 priv = netdev_priv(dev);
359 priv->state = CAIF_DISCONNECTED; 359 priv->state = CAIF_DISCONNECTED;
360 caif_disconnect_client(&priv->chnl); 360 caif_disconnect_client(dev_net(dev), &priv->chnl);
361 return 0; 361 return 0;
362} 362}
363 363