change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/net/caif/chnl_net.c
..
..
@@ -1,8 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) ST-Ericsson AB 2010
3
4
  * Authors:	Sjur Brendeland
4
5
  *		Daniel Martensson
5
- * License terms: GNU General Public License (GPL) version 2
6
6
  */
7
7
 
8
8
 #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
..
..
@@ -197,7 +197,8 @@
197
197
 	}
198
198
 }
199
199
 
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)
201
202
 {
202
203
 	struct chnl_net *priv;
203
204
 	struct cfpkt *pkt = NULL;
..
..
@@ -314,9 +315,6 @@
314
315
 
315
316
 	if (result == 0) {
316
317
 		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");
320
318
 		result = -ETIMEDOUT;
321
319
 		goto error;
322
320
 	}