forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/net/caif/chnl_net.c
....@@ -1,8 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Copyright (C) ST-Ericsson AB 2010
34 * Authors: Sjur Brendeland
45 * Daniel Martensson
5
- * License terms: GNU General Public License (GPL) version 2
66 */
77
88 #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
....@@ -197,7 +197,8 @@
197197 }
198198 }
199199
200
-static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
200
+static netdev_tx_t chnl_net_start_xmit(struct sk_buff *skb,
201
+ struct net_device *dev)
201202 {
202203 struct chnl_net *priv;
203204 struct cfpkt *pkt = NULL;
....@@ -314,9 +315,6 @@
314315
315316 if (result == 0) {
316317 pr_debug("connect timeout\n");
317
- caif_disconnect_client(dev_net(dev), &priv->chnl);
318
- priv->state = CAIF_DISCONNECTED;
319
- pr_debug("state disconnected\n");
320318 result = -ETIMEDOUT;
321319 goto error;
322320 }