Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 07:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

wimax: move to staging

Browse Source 
After I sent a fix for what appeared to be a harmless warning in
 the wimax user interface code, the conclusion was that the whole
 thing has most likely not been used in a very long time, and the
 user interface possibly been broken since b61a5eea59 ("wimax: use
 genl_register_family_with_ops()").
 
 Using a shared branch between net-next and staging should help
 coordinate patches getting submitted against it.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAl+bLh4ACgkQmmx57+YA
 GNkTuhAAkbL/tqJhjC2KzL+B7iFvPOk4eTu9T1g+4K67oUrSTPRi5J0rGhBuv2FL
 feNHR8a8fxBueZVKLM9cy4jdzROFr/tsLQEp0HzdNDTeIDoUi1WFTEkjj8zj5NUW
 BRriYfroR+ClIw6/OwW2A17838h5DERpLQqm5Y2E8KNLkmpG3rqs4i6zrcEaJne8
 0R51ZkcWq4Umn/mfzp5FCGLsOd8h+udgxmbTSNUEiB9X85vLs1i9gl/WPbfnq/eV
 m0uqgkagRGg71BLPvXEvjQY533KYFJMxk+01ZpNkZArpNLpvnFHa/Aw48XjidrOS
 FJzYNhtuunH/3SFYXZKJ5gzLJZdyLsH2lEfJZRo/YlwqzeiiXmdJmgH3wE9JRwKG
 In/8BI0epjr0+G5caJnoaKSisLI0MC7cEyOJ+TMDSETFcFbjAMnduMK4zHR+cYMV
 tzserwN7EmHqJFQ0Qou9/CIsClCuFcWoJvFQL9RxrlKfjVZqGuT96bk6Xu89IZNZ
 PP7vJvDdCLlpPq1T4M05stWpCXdt7comi2NbI0Ekh2VoAhpHjUh9Qvp+iM99GIsZ
 RvpAPMYVYahP3IYlYY7T2X+5Ai5lMdi1cWJilQB9R+bveJogdQTrCceMWNvNss0T
 3DfqZmAJH6l0eOrZMadb4qwHdc+4eXroTItay8XIPzDD9J7LoTg=
 =PyFd
 -----END PGP SIGNATURE-----

Merge tag 'wimax-staging' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground

Arnd Bergmann says:

====================
wimax: move to staging

After I sent a fix for what appeared to be a harmless warning in
the wimax user interface code, the conclusion was that the whole
thing has most likely not been used in a very long time, and the
user interface possibly been broken since b61a5eea59 ("wimax: use
genl_register_family_with_ops()").

Using a shared branch between net-next and staging should help
coordinate patches getting submitted against it.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2020-10-30 09:07:37 -07:00
commit 8911097fbf
51 changed files with 68 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/admin-guide/index.rst
View File

@ -115,7 +115,6 @@ configure specific aspects of kernel behavior to your liking.
unicode
vga-softcursor
video-output
wimax/index
xfs
.. only:: subproject and html

21
Documentation/networking/kapi.rst
View File

@ -83,27 +83,6 @@ SUN RPC subsystem
.. kernel-doc:: net/sunrpc/clnt.c
:export:
WiMAX
-----
.. kernel-doc:: net/wimax/op-msg.c
:export:
.. kernel-doc:: net/wimax/op-reset.c
:export:
.. kernel-doc:: net/wimax/op-rfkill.c
:export:
.. kernel-doc:: net/wimax/stack.c
:export:
.. kernel-doc:: include/net/wimax.h
:internal:
.. kernel-doc:: include/uapi/linux/wimax.h
:internal:
Network device support
======================

1
Documentation/translations/zh_CN/admin-guide/index.rst
View File

@ -114,7 +114,6 @@ Todolist:
unicode
vga-softcursor
video-output
wimax/index
xfs
.. only:: subproject and html

22
MAINTAINERS
View File

@ -9106,16 +9106,6 @@ W: https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
F: drivers/net/wireless/intel/iwlwifi/
INTEL WIRELESS WIMAX CONNECTION 2400
M: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
M: linux-wimax@intel.com
L: wimax@linuxwimax.org (subscribers-only)
S: Supported
W: http://linuxwimax.org
F: Documentation/admin-guide/wimax/i2400m.rst
F: drivers/net/wimax/i2400m/
F: include/uapi/linux/wimax/i2400m.h
INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER
M: Jithu Joseph <jithu.joseph@intel.com>
R: Maurice Ma <maurice.ma@intel.com>
@ -18907,18 +18897,6 @@ S: Supported
W: https://wireless.wiki.kernel.org/en/users/Drivers/wil6210
F: drivers/net/wireless/ath/wil6210/
WIMAX STACK
M: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
M: linux-wimax@intel.com
L: wimax@linuxwimax.org (subscribers-only)
S: Supported
W: http://linuxwimax.org
F: Documentation/admin-guide/wimax/wimax.rst
F: include/linux/wimax/debug.h
F: include/net/wimax.h
F: include/uapi/linux/wimax.h
F: net/wimax/
WINBOND CIR DRIVER
M: David Härdeman <david@hardeman.nu>
S: Maintained

2
drivers/net/Kconfig
View File

@ -489,8 +489,6 @@ source "drivers/net/usb/Kconfig"
source "drivers/net/wireless/Kconfig"
source "drivers/net/wimax/Kconfig"
source "drivers/net/wan/Kconfig"
source "drivers/net/ieee802154/Kconfig"

1
drivers/net/Makefile
View File

@ -66,7 +66,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_WLAN) += wireless/
obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_IEEE802154) += ieee802154/
obj-$(CONFIG_VMXNET3) += vmxnet3/

18
drivers/net/wimax/Kconfig
View File

@ -1,18 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# WiMAX LAN device drivers configuration
#
comment "Enable WiMAX (Networking options) to see the WiMAX drivers"
depends on WIMAX = n
if WIMAX
menu "WiMAX Wireless Broadband devices"
source "drivers/net/wimax/i2400m/Kconfig"
endmenu
endif

2
drivers/net/wimax/Makefile
View File

@ -1,2 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_WIMAX_I2400M) += i2400m/

2
drivers/staging/Kconfig
View File

@ -114,6 +114,8 @@ source "drivers/staging/kpc2000/Kconfig"
source "drivers/staging/qlge/Kconfig"
source "drivers/staging/wimax/Kconfig"
source "drivers/staging/wfx/Kconfig"
source "drivers/staging/hikey9xx/Kconfig"

1
drivers/staging/Makefile
View File

@ -47,5 +47,6 @@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/
obj-$(CONFIG_KPC2000) += kpc2000/
obj-$(CONFIG_QLGE) += qlge/
obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_WFX) += wfx/
obj-y += hikey9xx/

0
Documentation/admin-guide/wimax/i2400m.rst → drivers/staging/wimax/Documentation/i2400m.rst
View File

0
Documentation/admin-guide/wimax/index.rst → drivers/staging/wimax/Documentation/index.rst
View File

0
Documentation/admin-guide/wimax/wimax.rst → drivers/staging/wimax/Documentation/wimax.rst
View File

6
net/wimax/Kconfig → drivers/staging/wimax/Kconfig
View File

@ -22,6 +22,8 @@ menuconfig WIMAX
If unsure, it is safe to select M (module).
if WIMAX
config WIMAX_DEBUG_LEVEL
int "WiMAX debug level"
depends on WIMAX
@ -38,3 +40,7 @@ config WIMAX_DEBUG_LEVEL
If set at zero, this will compile out all the debug code.
It is recommended that it is left at 8.
source "drivers/staging/wimax/i2400m/Kconfig"
endif

2
net/wimax/Makefile → drivers/staging/wimax/Makefile
View File

@ -11,3 +11,5 @@ wimax-y := \
stack.o
wimax-$(CONFIG_DEBUG_FS) += debugfs.o
obj-$(CONFIG_WIMAX_I2400M) += i2400m/

18
drivers/staging/wimax/TODO Normal file
View File

@ -0,0 +1,18 @@
There are no known users of this driver as of October 2020, and it will
be removed unless someone turns out to still need it in future releases.
According to https://en.wikipedia.org/wiki/List_of_WiMAX_networks, there
have been many public wimax networks, but it appears that many of these
have migrated to LTE or discontinued their service altogether. As most
PCs and phones lack WiMAX hardware support, the remaining networks tend
to use standalone routers. These almost certainly run Linux, but not a
modern kernel or the mainline wimax driver stack.
NetworkManager appears to have dropped userspace support in 2015
https://bugzilla.gnome.org/show_bug.cgi?id=747846, the www.linuxwimax.org
site had already shut down earlier.
WiMax is apparently still being deployed on airport campus networks
("AeroMACS"), but in a frequency band that was not supported by the old
Intel 2400m (used in Sandy Bridge laptops and earlier), which is the
only driver using the kernel's wimax stack.

2
net/wimax/debug-levels.h → drivers/staging/wimax/debug-levels.h
View File

@ -13,7 +13,7 @@
#define D_MODULENAME wimax
#define D_MASTER CONFIG_WIMAX_DEBUG_LEVEL
#include <linux/wimax/debug.h>
#include "linux-wimax-debug.h"
/* List of all the enabled modules */
enum d_module {

2
net/wimax/debugfs.c → drivers/staging/wimax/debugfs.c
View File

@ -7,7 +7,7 @@
* Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
*/
#include <linux/debugfs.h>
#include <linux/wimax.h>
#include "linux-wimax.h"
#include "wimax-internal.h"
#define D_SUBMODULE debugfs

0
drivers/net/wimax/i2400m/Kconfig → drivers/staging/wimax/i2400m/Kconfig
View File

0
drivers/net/wimax/i2400m/Makefile → drivers/staging/wimax/i2400m/Makefile
View File

2
drivers/net/wimax/i2400m/control.c → drivers/staging/wimax/i2400m/control.c
View File

@ -77,7 +77,7 @@
#include "i2400m.h"
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/wimax/i2400m.h>
#include "linux-wimax-i2400m.h"
#include <linux/export.h>
#include <linux/moduleparam.h>

2
drivers/net/wimax/i2400m/debug-levels.h → drivers/staging/wimax/i2400m/debug-levels.h
View File

@ -13,7 +13,7 @@
#define D_MODULENAME i2400m
#define D_MASTER CONFIG_WIMAX_I2400M_DEBUG_LEVEL
#include <linux/wimax/debug.h>
#include "../linux-wimax-debug.h"
/* List of all the enabled modules */
enum d_module {

0
drivers/net/wimax/i2400m/debugfs.c → drivers/staging/wimax/i2400m/debugfs.c
View File

2
drivers/net/wimax/i2400m/driver.c → drivers/staging/wimax/i2400m/driver.c
View File

@ -50,7 +50,7 @@
*/
#include "i2400m.h"
#include <linux/etherdevice.h>
#include <linux/wimax/i2400m.h>
#include "linux-wimax-i2400m.h"
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/suspend.h>

0
drivers/net/wimax/i2400m/fw.c → drivers/staging/wimax/i2400m/fw.c
View File

0
drivers/net/wimax/i2400m/i2400m-usb.h → drivers/staging/wimax/i2400m/i2400m-usb.h
View File

4
drivers/net/wimax/i2400m/i2400m.h → drivers/staging/wimax/i2400m/i2400m.h
View File

@ -156,8 +156,8 @@
#include <linux/completion.h>
#include <linux/rwsem.h>
#include <linux/atomic.h>
#include <net/wimax.h>
#include <linux/wimax/i2400m.h>
#include "../net-wimax.h"
#include "linux-wimax-i2400m.h"
#include <asm/byteorder.h>
enum {

0
include/uapi/linux/wimax/i2400m.h → drivers/staging/wimax/i2400m/linux-wimax-i2400m.h
View File

0
drivers/net/wimax/i2400m/netdev.c → drivers/staging/wimax/i2400m/netdev.c
View File

2
drivers/net/wimax/i2400m/op-rfkill.c → drivers/staging/wimax/i2400m/op-rfkill.c
View File

@ -18,7 +18,7 @@
* switch (coming from sysfs, the wimax stack or user space).
*/
#include "i2400m.h"
#include <linux/wimax/i2400m.h>
#include "linux-wimax-i2400m.h"
#include <linux/slab.h>

0
drivers/net/wimax/i2400m/rx.c → drivers/staging/wimax/i2400m/rx.c
View File

0
drivers/net/wimax/i2400m/sysfs.c → drivers/staging/wimax/i2400m/sysfs.c
View File

0
drivers/net/wimax/i2400m/tx.c → drivers/staging/wimax/i2400m/tx.c
View File

2
drivers/net/wimax/i2400m/usb-debug-levels.h → drivers/staging/wimax/i2400m/usb-debug-levels.h
View File

@ -13,7 +13,7 @@
#define D_MODULENAME i2400m_usb
#define D_MASTER CONFIG_WIMAX_I2400M_DEBUG_LEVEL
#include <linux/wimax/debug.h>
#include "../linux-wimax-debug.h"
/* List of all the enabled modules */
enum d_module {

0
drivers/net/wimax/i2400m/usb-fw.c → drivers/staging/wimax/i2400m/usb-fw.c
View File

0
drivers/net/wimax/i2400m/usb-notif.c → drivers/staging/wimax/i2400m/usb-notif.c
View File

0
drivers/net/wimax/i2400m/usb-rx.c → drivers/staging/wimax/i2400m/usb-rx.c
View File

0
drivers/net/wimax/i2400m/usb-tx.c → drivers/staging/wimax/i2400m/usb-tx.c
View File

2
drivers/net/wimax/i2400m/usb.c → drivers/staging/wimax/i2400m/usb.c
View File

@ -49,7 +49,7 @@
* usb_reset_device()
*/
#include "i2400m-usb.h"
#include <linux/wimax/i2400m.h>
#include "linux-wimax-i2400m.h"
#include <linux/debugfs.h>
#include <linux/slab.h>
#include <linux/module.h>

2
net/wimax/id-table.c → drivers/staging/wimax/id-table.c
View File

@ -28,7 +28,7 @@
#include <net/genetlink.h>
#include <linux/netdevice.h>
#include <linux/list.h>
#include <linux/wimax.h>
#include "linux-wimax.h"
#include "wimax-internal.h"

2
include/linux/wimax/debug.h → drivers/staging/wimax/linux-wimax-debug.h
View File

@ -60,7 +60,7 @@
* #define D_MODULENAME modulename
* #define D_MASTER 10
*
* #include <linux/wimax/debug.h>
* #include "linux-wimax-debug.h"
*
* enum d_module {
* D_SUBMODULE_DECLARE(submodule_1),

0
include/uapi/linux/wimax.h → drivers/staging/wimax/linux-wimax.h
View File

2
include/net/wimax.h → drivers/staging/wimax/net-wimax.h
View File

@ -236,7 +236,7 @@
#ifndef __NET__WIMAX_H__
#define __NET__WIMAX_H__
#include <linux/wimax.h>
#include "linux-wimax.h"
#include <net/genetlink.h>
#include <linux/netdevice.h>

2
net/wimax/op-msg.c → drivers/staging/wimax/op-msg.c
View File

@ -60,7 +60,7 @@
#include <linux/slab.h>
#include <net/genetlink.h>
#include <linux/netdevice.h>
#include <linux/wimax.h>
#include "linux-wimax.h"
#include <linux/security.h>
#include <linux/export.h>
#include "wimax-internal.h"

4
net/wimax/op-reset.c → drivers/staging/wimax/op-reset.c
View File

@ -13,9 +13,9 @@
* disconnect and reconnect the device).
*/
#include <net/wimax.h>
#include "net-wimax.h"
#include <net/genetlink.h>
#include <linux/wimax.h>
#include "linux-wimax.h"
#include <linux/security.h>
#include <linux/export.h>
#include "wimax-internal.h"

4
net/wimax/op-rfkill.c → drivers/staging/wimax/op-rfkill.c
View File

@ -45,9 +45,9 @@
* wimax_rfkill_rm() [called by wimax_dev_add/rm()]
*/
#include <net/wimax.h>
#include "net-wimax.h"
#include <net/genetlink.h>
#include <linux/wimax.h>
#include "linux-wimax.h"
#include <linux/security.h>
#include <linux/rfkill.h>
#include <linux/export.h>

4
net/wimax/op-state-get.c → drivers/staging/wimax/op-state-get.c
View File

@ -10,9 +10,9 @@
* Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
*/
#include <net/wimax.h>
#include "net-wimax.h"
#include <net/genetlink.h>
#include <linux/wimax.h>
#include "linux-wimax.h"
#include <linux/security.h>
#include "wimax-internal.h"

29
net/wimax/stack.c → drivers/staging/wimax/stack.c
View File

@ -39,7 +39,7 @@
#include <linux/gfp.h>
#include <net/genetlink.h>
#include <linux/netdevice.h>
#include <linux/wimax.h>
#include "linux-wimax.h"
#include <linux/module.h>
#include "wimax-internal.h"
@ -388,17 +388,24 @@ void wimax_dev_init(struct wimax_dev *wimax_dev)
}
EXPORT_SYMBOL_GPL(wimax_dev_init);
/*
* There are multiple enums reusing the same values, adding
* others is only possible if they use a compatible policy.
*/
static const struct nla_policy wimax_gnl_policy[WIMAX_GNL_ATTR_MAX + 1] = {
[WIMAX_GNL_RESET_IFIDX] = { .type = NLA_U32, },
[WIMAX_GNL_RFKILL_IFIDX] = { .type = NLA_U32, },
[WIMAX_GNL_RFKILL_STATE] = {
.type = NLA_U32 /* enum wimax_rf_state */
},
[WIMAX_GNL_STGET_IFIDX] = { .type = NLA_U32, },
[WIMAX_GNL_MSG_IFIDX] = { .type = NLA_U32, },
[WIMAX_GNL_MSG_DATA] = {
.type = NLA_UNSPEC, /* libnl doesn't grok BINARY yet */
},
/*
* WIMAX_GNL_RESET_IFIDX, WIMAX_GNL_RFKILL_IFIDX,
* WIMAX_GNL_STGET_IFIDX, WIMAX_GNL_MSG_IFIDX
*/
[1] = { .type = NLA_U32, },
/*
* WIMAX_GNL_RFKILL_STATE, WIMAX_GNL_MSG_PIPE_NAME
*/
[2] = { .type = NLA_U32, }, /* enum wimax_rf_state */
/*
* WIMAX_GNL_MSG_DATA
*/
[3] = { .type = NLA_UNSPEC, }, /* libnl doesn't grok BINARY yet */
};
static const struct genl_small_ops wimax_gnl_ops[] = {

2
net/wimax/wimax-internal.h → drivers/staging/wimax/wimax-internal.h
View File

@ -22,7 +22,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/device.h>
#include <net/wimax.h>
#include "net-wimax.h"
/*

2
net/Kconfig
View File

@ -386,8 +386,6 @@ source "net/mac80211/Kconfig"
endif # WIRELESS
source "net/wimax/Kconfig"
source "net/rfkill/Kconfig"
source "net/9p/Kconfig"
source "net/caif/Kconfig"

1
net/Makefile
View File

@ -66,7 +66,6 @@ obj-$(CONFIG_MAC802154) += mac802154/
ifeq ($(CONFIG_NET),y)
obj-$(CONFIG_SYSCTL) += sysctl_net.o
endif
obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_DNS_RESOLVER) += dns_resolver/
obj-$(CONFIG_CEPH_LIB) += ceph/
obj-$(CONFIG_BATMAN_ADV) += batman-adv/