hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/net/wireless/zydas/zd1201.c
....@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Driver for ZyDAS zd1201 based wireless USB devices.
34 *
45 * Copyright (c) 2004, 2005 Jeroen Vreeken (pe1rxq@amsat.org)
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- * modify it under the terms of the GNU General Public License
8
- * version 2 as published by the Free Software Foundation.
96 *
107 * Parts of this driver have been derived from a wlan-ng version
118 * modified by ZyDAS. They also made documentation available, thanks!
....@@ -833,7 +830,7 @@
833830 return NETDEV_TX_OK;
834831 }
835832
836
-static void zd1201_tx_timeout(struct net_device *dev)
833
+static void zd1201_tx_timeout(struct net_device *dev, unsigned int txqueue)
837834 {
838835 struct zd1201 *zd = netdev_priv(dev);
839836
....@@ -969,6 +966,7 @@
969966 */
970967 zd1201_join(zd, "\0-*#\0", 5);
971968 /* Put port in pIBSS */
969
+ /* Fall through */
972970 case 8: /* No pseudo-IBSS in wireless extensions (yet) */
973971 porttype = ZD1201_PORTTYPE_PSEUDOIBSS;
974972 break;
....@@ -1654,15 +1652,11 @@
16541652 struct iw_request_info *info, struct iw_param *rrq, char *extra)
16551653 {
16561654 struct zd1201 *zd = netdev_priv(dev);
1657
- int err;
16581655
16591656 if (!zd->ap)
16601657 return -EOPNOTSUPP;
16611658
1662
- err = zd1201_setconfig16(zd, ZD1201_RID_CNFMAXASSOCSTATIONS, rrq->value);
1663
- if (err)
1664
- return err;
1665
- return 0;
1659
+ return zd1201_setconfig16(zd, ZD1201_RID_CNFMAXASSOCSTATIONS, rrq->value);
16661660 }
16671661
16681662 static int zd1201_get_maxassoc(struct net_device *dev,