-----Original Message-----
From: Jakub Kicinski <kuba@kernel.org>
Sent: Thursday, June 11, 2020 10:30
To: davem@davemloft.net
Cc: <redacted>; <redacted>; Jakub Kicinski
[off-list ref]; klassert@kernel.org; akiyano@amazon.com;
irusskikh@marvell.com; ioana.ciornei@nxp.com; kys@microsoft.com;
saeedm@mellanox.com; jdmason@kudzu.us; snelson@pensando.io; GR-Linux-
NIC-Dev@marvell.com; stuyoder@gmail.com; Kirsher, Jeffrey T
[off-list ref]; sgoutham@marvell.com; luobin9@huawei.com;
csully@google.com; kou.ishizaki@toshiba.co.jp; peppe.cavallaro@st.com;
chessman@tux.org
Subject: [RFC 1/8] docs: networking: reorganize driver documentation again
Organize driver documentation by device type. Most documents
have fairly verbose yet uninformative names, so let users
first select a well defined device type, and then search for
a particular driver.
While at it rename the section from Vendor drivers to
Hardware drivers. This seems more accurate, besides people
sometimes refer to out-of-tree drivers as vendor drivers.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--
CC: klassert@kernel.org
CC: akiyano@amazon.com
CC: <redacted>
CC: ioana.ciornei@nxp.com
CC: <redacted>
CC: <redacted>
CC: jdmason@kudzu.us
CC: <redacted>
CC: <redacted>
CC: <redacted>
CC: <redacted>
CC: sgoutham@marvell.com
CC: <redacted>
CC: <redacted>
CC: <redacted>
CC: <redacted>
CC: chessman@tux.org
---
.../devicetree/bindings/misc/fsl,qoriq-mc.txt | 2 +-
.../networking/device_drivers/cable/index.rst | 18 +++++
.../device_drivers/{ => cable}/sb1000.rst | 0
.../device_drivers/cellular/index.rst | 18 +++++
.../{ => cellular}/qualcomm/rmnet.rst | 0
.../{ => ethernet}/3com/3c509.rst | 0
.../{ => ethernet}/3com/vortex.rst | 2 -
.../{ => ethernet}/amazon/ena.rst | 0
.../{ => ethernet}/aquantia/atlantic.rst | 0
.../{ => ethernet}/chelsio/cxgb.rst | 0
.../{ => ethernet}/cirrus/cs89x0.rst | 0
.../{ => ethernet}/davicom/dm9000.rst | 0
.../{ => ethernet}/dec/de4x5.rst | 0
.../{ => ethernet}/dec/dmfe.rst | 0
.../{ => ethernet}/dlink/dl2k.rst | 0
.../{ => ethernet}/freescale/dpaa.rst | 0
.../freescale/dpaa2/dpio-driver.rst | 6 +-
.../freescale/dpaa2/ethernet-driver.rst | 3 +-
.../{ => ethernet}/freescale/dpaa2/index.rst | 0
.../freescale/dpaa2/mac-phy-support.rst | 0
.../freescale/dpaa2/overview.rst | 0
.../{ => ethernet}/freescale/gianfar.rst | 0
.../{ => ethernet}/google/gve.rst | 0
.../device_drivers/ethernet/index.rst | 58 ++++++++++++++++
.../{ => ethernet}/intel/e100.rst | 0
.../{ => ethernet}/intel/e1000.rst | 0
.../{ => ethernet}/intel/e1000e.rst | 0
.../{ => ethernet}/intel/fm10k.rst | 0
.../{ => ethernet}/intel/i40e.rst | 0
.../{ => ethernet}/intel/iavf.rst | 0
.../{ => ethernet}/intel/ice.rst | 0
.../{ => ethernet}/intel/igb.rst | 0
.../{ => ethernet}/intel/igbvf.rst | 0
.../{ => ethernet}/intel/ixgb.rst | 0
.../{ => ethernet}/intel/ixgbe.rst | 0
.../{ => ethernet}/intel/ixgbevf.rst | 0
.../{ => ethernet}/marvell/octeontx2.rst | 0
.../{ => ethernet}/mellanox/mlx5.rst | 0
.../{ => ethernet}/microsoft/netvsc.rst | 0
.../{ => ethernet}/neterion/s2io.rst | 0
.../{ => ethernet}/neterion/vxge.rst | 0
.../{ => ethernet}/netronome/nfp.rst | 0
.../{ => ethernet}/pensando/ionic.rst | 0
.../{ => ethernet}/smsc/smc9.rst | 0
.../{ => ethernet}/stmicro/stmmac.rst | 0
.../device_drivers/{ => ethernet}/ti/cpsw.rst | 0
.../{ => ethernet}/ti/cpsw_switchdev.rst | 0
.../device_drivers/{ => ethernet}/ti/tlan.rst | 0
.../{ => ethernet}/toshiba/spider_net.rst | 0
.../networking/device_drivers/index.rst | 51 ++------------
.../networking/device_drivers/wifi/index.rst | 19 ++++++
.../{ => wifi}/intel/ipw2100.rst | 0
.../{ => wifi}/intel/ipw2200.rst | 0
MAINTAINERS | 66 +++++++++----------
drivers/net/Kconfig | 2 +-
drivers/net/ethernet/3com/3c59x.c | 4 +-
drivers/net/ethernet/3com/Kconfig | 4 +-
drivers/net/ethernet/chelsio/Kconfig | 2 +-
drivers/net/ethernet/cirrus/Kconfig | 2 +-
drivers/net/ethernet/dec/tulip/Kconfig | 4 +-
drivers/net/ethernet/dlink/dl2k.c | 10 +--
drivers/net/ethernet/intel/Kconfig | 24 +++----
drivers/net/ethernet/neterion/Kconfig | 4 +-
drivers/net/ethernet/pensando/Kconfig | 2 +-
drivers/net/ethernet/smsc/Kconfig | 4 +-
drivers/net/ethernet/ti/Kconfig | 2 +-
drivers/net/ethernet/ti/tlan.c | 2 +-
drivers/net/wireless/intel/ipw2x00/Kconfig | 4 +-
drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +-
69 files changed, 191 insertions(+), 124 deletions(-)
create mode 100644 Documentation/networking/device_drivers/cable/index.rst
rename Documentation/networking/device_drivers/{ => cable}/sb1000.rst
(100%)
create mode 100644
Documentation/networking/device_drivers/cellular/index.rst
rename Documentation/networking/device_drivers/{ =>
cellular}/qualcomm/rmnet.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/3com/3c509.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/3com/vortex.rst (99%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/amazon/ena.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/aquantia/atlantic.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/chelsio/cxgb.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/cirrus/cs89x0.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/davicom/dm9000.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/dec/de4x5.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/dec/dmfe.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/dlink/dl2k.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/freescale/dpaa.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/freescale/dpaa2/dpio-driver.rst (97%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/freescale/dpaa2/ethernet-driver.rst (98%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/freescale/dpaa2/index.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/freescale/dpaa2/mac-phy-support.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/freescale/dpaa2/overview.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/freescale/gianfar.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/google/gve.rst (100%)
create mode 100644
Documentation/networking/device_drivers/ethernet/index.rst
rename Documentation/networking/device_drivers/{ =>
ethernet}/intel/e100.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/intel/e1000.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/intel/e1000e.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/intel/fm10k.rst (100%)
rename Documentation/networking/device_drivers/{ => ethernet}/intel/i40e.rst
(100%)
rename Documentation/networking/device_drivers/{ => ethernet}/intel/iavf.rst
(100%)
rename Documentation/networking/device_drivers/{ => ethernet}/intel/ice.rst
(100%)
rename Documentation/networking/device_drivers/{ => ethernet}/intel/igb.rst
(100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/intel/igbvf.rst (100%)
rename Documentation/networking/device_drivers/{ => ethernet}/intel/ixgb.rst
(100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/intel/ixgbe.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/intel/ixgbevf.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/marvell/octeontx2.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/mellanox/mlx5.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/microsoft/netvsc.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/neterion/s2io.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/neterion/vxge.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/netronome/nfp.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/pensando/ionic.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/smsc/smc9.rst (100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/stmicro/stmmac.rst (100%)
rename Documentation/networking/device_drivers/{ => ethernet}/ti/cpsw.rst
(100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/ti/cpsw_switchdev.rst (100%)
rename Documentation/networking/device_drivers/{ => ethernet}/ti/tlan.rst
(100%)
rename Documentation/networking/device_drivers/{ =>
ethernet}/toshiba/spider_net.rst (100%)
create mode 100644 Documentation/networking/device_drivers/wifi/index.rst
rename Documentation/networking/device_drivers/{ => wifi}/intel/ipw2100.rst
(100%)
rename Documentation/networking/device_drivers/{ => wifi}/intel/ipw2200.rst
(100%)
diff --git a/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
b/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
index 9134e9bcca56..b12f9be1251f 100644
--- a/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
+++ b/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
@@ -10,7 +10,7 @@ such as network interfaces, crypto accelerator instances,
L2 switches,
etc.
For an overview of the DPAA2 architecture and fsl-mc bus see:
-Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
+Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.
rst
As described in the above overview, all DPAA2 objects in a DPRC share the
same hardware "isolation context" and a 10-bit value called an ICID
diff --git a/Documentation/networking/device_drivers/cable/index.rst
b/Documentation/networking/device_drivers/cable/index.rst
new file mode 100644
index 000000000000..cce3c4392972
--- /dev/null
+++ b/Documentation/networking/device_drivers/cable/index.rst
@@ -0,0 +1,18 @@
+.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+
+Cable Modem Device Drivers
+==========================
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ sb1000
+
+.. only:: subproject and html
+
+ Indices
+ =======
+
+ * :ref:`genindex`
diff --git a/Documentation/networking/device_drivers/sb1000.rst
b/Documentation/networking/device_drivers/cable/sb1000.rst
similarity index 100%
rename from Documentation/networking/device_drivers/sb1000.rst
rename to Documentation/networking/device_drivers/cable/sb1000.rst
diff --git a/Documentation/networking/device_drivers/cellular/index.rst
b/Documentation/networking/device_drivers/cellular/index.rst
new file mode 100644
index 000000000000..fc1812d3fc70
--- /dev/null
+++ b/Documentation/networking/device_drivers/cellular/index.rst
@@ -0,0 +1,18 @@
+.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+
+Cellular Modem Device Drivers
+=============================
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ qualcomm/rmnet
+
+.. only:: subproject and html
+
+ Indices
+ =======
+
+ * :ref:`genindex`
diff --git a/Documentation/networking/device_drivers/qualcomm/rmnet.rst
b/Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
similarity index 100%
rename from Documentation/networking/device_drivers/qualcomm/rmnet.rst
rename to
Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
diff --git a/Documentation/networking/device_drivers/3com/3c509.rst
b/Documentation/networking/device_drivers/ethernet/3com/3c509.rst
similarity index 100%
rename from Documentation/networking/device_drivers/3com/3c509.rst
rename to Documentation/networking/device_drivers/ethernet/3com/3c509.rst
diff --git a/Documentation/networking/device_drivers/3com/vortex.rst
b/Documentation/networking/device_drivers/ethernet/3com/vortex.rst
similarity index 99%
rename from Documentation/networking/device_drivers/3com/vortex.rst
rename to Documentation/networking/device_drivers/ethernet/3com/vortex.rst
index 800add5be338..eab10fc6da5c 100644
--- a/Documentation/networking/device_drivers/3com/vortex.rst
+++ b/Documentation/networking/device_drivers/ethernet/3com/vortex.rst
@@ -4,8 +4,6 @@
3Com Vortex device driver
=========================
-Documentation/networking/device_drivers/3com/vortex.rst
-
Andrew Morton
30 April 2000
diff --git a/Documentation/networking/device_drivers/amazon/ena.rst
b/Documentation/networking/device_drivers/ethernet/amazon/ena.rst
similarity index 100%
rename from Documentation/networking/device_drivers/amazon/ena.rst
rename to Documentation/networking/device_drivers/ethernet/amazon/ena.rst
diff --git a/Documentation/networking/device_drivers/aquantia/atlantic.rst
b/Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst
similarity index 100%
rename from Documentation/networking/device_drivers/aquantia/atlantic.rst
rename to
Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst
diff --git a/Documentation/networking/device_drivers/chelsio/cxgb.rst
b/Documentation/networking/device_drivers/ethernet/chelsio/cxgb.rst
similarity index 100%
rename from Documentation/networking/device_drivers/chelsio/cxgb.rst
rename to Documentation/networking/device_drivers/ethernet/chelsio/cxgb.rst
diff --git a/Documentation/networking/device_drivers/cirrus/cs89x0.rst
b/Documentation/networking/device_drivers/ethernet/cirrus/cs89x0.rst
similarity index 100%
rename from Documentation/networking/device_drivers/cirrus/cs89x0.rst
rename to Documentation/networking/device_drivers/ethernet/cirrus/cs89x0.rst
diff --git a/Documentation/networking/device_drivers/davicom/dm9000.rst
b/Documentation/networking/device_drivers/ethernet/davicom/dm9000.rst
similarity index 100%
rename from Documentation/networking/device_drivers/davicom/dm9000.rst
rename to
Documentation/networking/device_drivers/ethernet/davicom/dm9000.rst
diff --git a/Documentation/networking/device_drivers/dec/de4x5.rst
b/Documentation/networking/device_drivers/ethernet/dec/de4x5.rst
similarity index 100%
rename from Documentation/networking/device_drivers/dec/de4x5.rst
rename to Documentation/networking/device_drivers/ethernet/dec/de4x5.rst
diff --git a/Documentation/networking/device_drivers/dec/dmfe.rst
b/Documentation/networking/device_drivers/ethernet/dec/dmfe.rst
similarity index 100%
rename from Documentation/networking/device_drivers/dec/dmfe.rst
rename to Documentation/networking/device_drivers/ethernet/dec/dmfe.rst
diff --git a/Documentation/networking/device_drivers/dlink/dl2k.rst
b/Documentation/networking/device_drivers/ethernet/dlink/dl2k.rst
similarity index 100%
rename from Documentation/networking/device_drivers/dlink/dl2k.rst
rename to Documentation/networking/device_drivers/ethernet/dlink/dl2k.rst
diff --git a/Documentation/networking/device_drivers/freescale/dpaa.rst
b/Documentation/networking/device_drivers/ethernet/freescale/dpaa.rst
similarity index 100%
rename from Documentation/networking/device_drivers/freescale/dpaa.rst
rename to
Documentation/networking/device_drivers/ethernet/freescale/dpaa.rst
diff --git a/Documentation/networking/device_drivers/freescale/dpaa2/dpio-
driver.rst
b/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/dpio-
driver.rst
similarity index 97%
rename from Documentation/networking/device_drivers/freescale/dpaa2/dpio-
driver.rst
rename to
Documentation/networking/device_drivers/ethernet/freescale/dpaa2/dpio-
driver.rst
index 17dbee1ac53e..c50fd46631e0 100644
--- a/Documentation/networking/device_drivers/freescale/dpaa2/dpio-driver.rst
+++
b/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/dpio-
driver.rst
@@ -19,8 +19,10 @@ pool management for network interfaces.
This document provides an overview the Linux DPIO driver, its
subcomponents, and its APIs.
-See Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
for
-a general overview of DPAA2 and the general DPAA2 driver architecture in
Linux.
+See
+Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.
rst
+for a general overview of DPAA2 and the general DPAA2 driver architecture
+in Linux.
Driver Overview
---------------
diff --git a/Documentation/networking/device_drivers/freescale/dpaa2/ethernet-
driver.rst
b/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-
driver.rst
similarity index 98%
rename from
Documentation/networking/device_drivers/freescale/dpaa2/ethernet-driver.rst
rename to
Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-
driver.rst
index cb4c9a0c5a17..682f3986c15b 100644
--- a/Documentation/networking/device_drivers/freescale/dpaa2/ethernet-
driver.rst
+++
b/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-
driver.rst
@@ -33,7 +33,8 @@ hardware resources, like queues, do not have a
corresponding MC object and
are treated as internal resources of other objects.
For a more detailed description of the DPAA2 architecture and its object
-abstractions see
*Documentation/networking/device_drivers/freescale/dpaa2/overview.rst*.
+abstractions see
+*Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overvie
w.rst*.
Each Linux net device is built on top of a Datapath Network Interface (DPNI)
object and uses Buffer Pools (DPBPs), I/O Portals (DPIOs) and Concentrators
diff --git a/Documentation/networking/device_drivers/freescale/dpaa2/index.rst
b/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/index.rst
similarity index 100%
rename from
Documentation/networking/device_drivers/freescale/dpaa2/index.rst
rename to
Documentation/networking/device_drivers/ethernet/freescale/dpaa2/index.rst
diff --git a/Documentation/networking/device_drivers/freescale/dpaa2/mac-phy-
support.rst
b/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac-phy-
support.rst
similarity index 100%
rename from Documentation/networking/device_drivers/freescale/dpaa2/mac-
phy-support.rst
rename to
Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac-phy-
support.rst
diff --git
a/Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
b/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview
.rst
similarity index 100%
rename from
Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
rename to
Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rs
t
diff --git a/Documentation/networking/device_drivers/freescale/gianfar.rst
b/Documentation/networking/device_drivers/ethernet/freescale/gianfar.rst
similarity index 100%
rename from Documentation/networking/device_drivers/freescale/gianfar.rst
rename to
Documentation/networking/device_drivers/ethernet/freescale/gianfar.rst
diff --git a/Documentation/networking/device_drivers/google/gve.rst
b/Documentation/networking/device_drivers/ethernet/google/gve.rst
similarity index 100%
rename from Documentation/networking/device_drivers/google/gve.rst
rename to Documentation/networking/device_drivers/ethernet/google/gve.rst
diff --git a/Documentation/networking/device_drivers/ethernet/index.rst
b/Documentation/networking/device_drivers/ethernet/index.rst
new file mode 100644
index 000000000000..fd3873024da8
--- /dev/null
+++ b/Documentation/networking/device_drivers/ethernet/index.rst
@@ -0,0 +1,58 @@
+.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+
+Ethernet Device Drivers
+=======================
+
+Device drivers for Ethernet and Ethernet-based virtual function devices.
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ 3com/3c509
+ 3com/vortex
+ amazon/ena
+ aquantia/atlantic
+ chelsio/cxgb
+ cirrus/cs89x0
+ dlink/dl2k
+ davicom/dm9000
+ dec/de4x5
+ dec/dmfe
+ freescale/dpaa
+ freescale/dpaa2/index
+ freescale/gianfar
+ google/gve
+ intel/e100
+ intel/e1000
+ intel/e1000e
+ intel/fm10k
+ intel/igb
+ intel/igbvf
+ intel/ixgb
+ intel/ixgbe
+ intel/ixgbevf
+ intel/i40e
+ intel/iavf
+ intel/ice
+ marvell/octeontx2
+ mellanox/mlx5
+ microsoft/netvsc
+ neterion/s2io
+ neterion/vxge
+ netronome/nfp
+ pensando/ionic
+ smsc/smc9
+ stmicro/stmmac
+ ti/cpsw
+ ti/cpsw_switchdev
+ ti/tlan
+ toshiba/spider_net
+
+.. only:: subproject and html
+
+ Indices
+ =======
+
+ * :ref:`genindex`
diff --git a/Documentation/networking/device_drivers/intel/e100.rst
b/Documentation/networking/device_drivers/ethernet/intel/e100.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/e100.rst
rename to Documentation/networking/device_drivers/ethernet/intel/e100.rst
diff --git a/Documentation/networking/device_drivers/intel/e1000.rst
b/Documentation/networking/device_drivers/ethernet/intel/e1000.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/e1000.rst
rename to Documentation/networking/device_drivers/ethernet/intel/e1000.rst
diff --git a/Documentation/networking/device_drivers/intel/e1000e.rst
b/Documentation/networking/device_drivers/ethernet/intel/e1000e.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/e1000e.rst
rename to Documentation/networking/device_drivers/ethernet/intel/e1000e.rst
diff --git a/Documentation/networking/device_drivers/intel/fm10k.rst
b/Documentation/networking/device_drivers/ethernet/intel/fm10k.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/fm10k.rst
rename to Documentation/networking/device_drivers/ethernet/intel/fm10k.rst
diff --git a/Documentation/networking/device_drivers/intel/i40e.rst
b/Documentation/networking/device_drivers/ethernet/intel/i40e.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/i40e.rst
rename to Documentation/networking/device_drivers/ethernet/intel/i40e.rst
diff --git a/Documentation/networking/device_drivers/intel/iavf.rst
b/Documentation/networking/device_drivers/ethernet/intel/iavf.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/iavf.rst
rename to Documentation/networking/device_drivers/ethernet/intel/iavf.rst
diff --git a/Documentation/networking/device_drivers/intel/ice.rst
b/Documentation/networking/device_drivers/ethernet/intel/ice.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/ice.rst
rename to Documentation/networking/device_drivers/ethernet/intel/ice.rst
diff --git a/Documentation/networking/device_drivers/intel/igb.rst
b/Documentation/networking/device_drivers/ethernet/intel/igb.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/igb.rst
rename to Documentation/networking/device_drivers/ethernet/intel/igb.rst
diff --git a/Documentation/networking/device_drivers/intel/igbvf.rst
b/Documentation/networking/device_drivers/ethernet/intel/igbvf.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/igbvf.rst
rename to Documentation/networking/device_drivers/ethernet/intel/igbvf.rst
diff --git a/Documentation/networking/device_drivers/intel/ixgb.rst
b/Documentation/networking/device_drivers/ethernet/intel/ixgb.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/ixgb.rst
rename to Documentation/networking/device_drivers/ethernet/intel/ixgb.rst
diff --git a/Documentation/networking/device_drivers/intel/ixgbe.rst
b/Documentation/networking/device_drivers/ethernet/intel/ixgbe.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/ixgbe.rst
rename to Documentation/networking/device_drivers/ethernet/intel/ixgbe.rst
diff --git a/Documentation/networking/device_drivers/intel/ixgbevf.rst
b/Documentation/networking/device_drivers/ethernet/intel/ixgbevf.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/ixgbevf.rst
rename to Documentation/networking/device_drivers/ethernet/intel/ixgbevf.rst
diff --git a/Documentation/networking/device_drivers/marvell/octeontx2.rst
b/Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
similarity index 100%
rename from Documentation/networking/device_drivers/marvell/octeontx2.rst
rename to
Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
diff --git a/Documentation/networking/device_drivers/mellanox/mlx5.rst
b/Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst
similarity index 100%
rename from Documentation/networking/device_drivers/mellanox/mlx5.rst
rename to
Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst
diff --git a/Documentation/networking/device_drivers/microsoft/netvsc.rst
b/Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
similarity index 100%
rename from Documentation/networking/device_drivers/microsoft/netvsc.rst
rename to
Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
diff --git a/Documentation/networking/device_drivers/neterion/s2io.rst
b/Documentation/networking/device_drivers/ethernet/neterion/s2io.rst
similarity index 100%
rename from Documentation/networking/device_drivers/neterion/s2io.rst
rename to Documentation/networking/device_drivers/ethernet/neterion/s2io.rst
diff --git a/Documentation/networking/device_drivers/neterion/vxge.rst
b/Documentation/networking/device_drivers/ethernet/neterion/vxge.rst
similarity index 100%
rename from Documentation/networking/device_drivers/neterion/vxge.rst
rename to Documentation/networking/device_drivers/ethernet/neterion/vxge.rst
diff --git a/Documentation/networking/device_drivers/netronome/nfp.rst
b/Documentation/networking/device_drivers/ethernet/netronome/nfp.rst
similarity index 100%
rename from Documentation/networking/device_drivers/netronome/nfp.rst
rename to
Documentation/networking/device_drivers/ethernet/netronome/nfp.rst
diff --git a/Documentation/networking/device_drivers/pensando/ionic.rst
b/Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
similarity index 100%
rename from Documentation/networking/device_drivers/pensando/ionic.rst
rename to
Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
diff --git a/Documentation/networking/device_drivers/smsc/smc9.rst
b/Documentation/networking/device_drivers/ethernet/smsc/smc9.rst
similarity index 100%
rename from Documentation/networking/device_drivers/smsc/smc9.rst
rename to Documentation/networking/device_drivers/ethernet/smsc/smc9.rst
diff --git a/Documentation/networking/device_drivers/stmicro/stmmac.rst
b/Documentation/networking/device_drivers/ethernet/stmicro/stmmac.rst
similarity index 100%
rename from Documentation/networking/device_drivers/stmicro/stmmac.rst
rename to
Documentation/networking/device_drivers/ethernet/stmicro/stmmac.rst
diff --git a/Documentation/networking/device_drivers/ti/cpsw.rst
b/Documentation/networking/device_drivers/ethernet/ti/cpsw.rst
similarity index 100%
rename from Documentation/networking/device_drivers/ti/cpsw.rst
rename to Documentation/networking/device_drivers/ethernet/ti/cpsw.rst
diff --git a/Documentation/networking/device_drivers/ti/cpsw_switchdev.rst
b/Documentation/networking/device_drivers/ethernet/ti/cpsw_switchdev.rst
similarity index 100%
rename from Documentation/networking/device_drivers/ti/cpsw_switchdev.rst
rename to
Documentation/networking/device_drivers/ethernet/ti/cpsw_switchdev.rst
diff --git a/Documentation/networking/device_drivers/ti/tlan.rst
b/Documentation/networking/device_drivers/ethernet/ti/tlan.rst
similarity index 100%
rename from Documentation/networking/device_drivers/ti/tlan.rst
rename to Documentation/networking/device_drivers/ethernet/ti/tlan.rst
diff --git a/Documentation/networking/device_drivers/toshiba/spider_net.rst
b/Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
similarity index 100%
rename from Documentation/networking/device_drivers/toshiba/spider_net.rst
rename to
Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
diff --git a/Documentation/networking/device_drivers/index.rst
b/Documentation/networking/device_drivers/index.rst
index e18dad11bc72..2d4817fc6a29 100644
--- a/Documentation/networking/device_drivers/index.rst
+++ b/Documentation/networking/device_drivers/index.rst
@@ -1,56 +1,17 @@
.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-Vendor Device Drivers
-=====================
+Hardware Device Drivers
+=======================
Contents:
.. toctree::
:maxdepth: 2
- freescale/dpaa2/index
- intel/e100
- intel/e1000
- intel/e1000e
- intel/fm10k
- intel/igb
- intel/igbvf
- intel/ixgb
- intel/ixgbe
- intel/ixgbevf
- intel/i40e
- intel/iavf
- intel/ice
- google/gve
- marvell/octeontx2
- mellanox/mlx5
- netronome/nfp
- pensando/ionic
- stmicro/stmmac
- 3com/3c509
- 3com/vortex
- amazon/ena
- aquantia/atlantic
- chelsio/cxgb
- cirrus/cs89x0
- davicom/dm9000
- dec/de4x5
- dec/dmfe
- dlink/dl2k
- freescale/dpaa
- freescale/gianfar
- intel/ipw2100
- intel/ipw2200
- microsoft/netvsc
- neterion/s2io
- neterion/vxge
- qualcomm/rmnet
- sb1000
- smsc/smc9
- ti/cpsw_switchdev
- ti/cpsw
- ti/tlan
- toshiba/spider_net
+ cable/index
+ cellular/index
+ ethernet/index
+ wifi/index
.. only:: subproject and html
diff --git a/Documentation/networking/device_drivers/wifi/index.rst
b/Documentation/networking/device_drivers/wifi/index.rst
new file mode 100644
index 000000000000..fb394f5de4a9
--- /dev/null
+++ b/Documentation/networking/device_drivers/wifi/index.rst
@@ -0,0 +1,19 @@
+.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+
+Wi-Fi Device Drivers
+====================
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ intel/ipw2100
+ intel/ipw2200
+
+.. only:: subproject and html
+
+ Indices
+ =======
+
+ * :ref:`genindex`
diff --git a/Documentation/networking/device_drivers/intel/ipw2100.rst
b/Documentation/networking/device_drivers/wifi/intel/ipw2100.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/ipw2100.rst
rename to Documentation/networking/device_drivers/wifi/intel/ipw2100.rst
diff --git a/Documentation/networking/device_drivers/intel/ipw2200.rst
b/Documentation/networking/device_drivers/wifi/intel/ipw2200.rst
similarity index 100%
rename from Documentation/networking/device_drivers/intel/ipw2200.rst
rename to Documentation/networking/device_drivers/wifi/intel/ipw2200.rst
diff --git a/MAINTAINERS b/MAINTAINERS
index f08f290df174..154a6d34257e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -147,7 +147,7 @@ Maintainers List
M: Steffen Klassert <klassert@kernel.org>
L: netdev@vger.kernel.org
S: Odd Fixes
-F: Documentation/networking/device_drivers/3com/vortex.rst
+F: Documentation/networking/device_drivers/ethernet/3com/vortex.rst
F: drivers/net/ethernet/3com/3c59x.c
3CR990 NETWORK DRIVER
@@ -816,7 +816,7 @@ R: Saeed Bishara <saeedb@amazon.com>
R: Zorik Machulsky <zorik@amazon.com>
L: netdev@vger.kernel.org
S: Supported
-F: Documentation/networking/device_drivers/amazon/ena.rst
+F: Documentation/networking/device_drivers/ethernet/amazon/ena.rst
F: drivers/net/ethernet/amazon/
AMAZON RDMA EFA DRIVER
@@ -1295,7 +1295,7 @@ L: netdev@vger.kernel.org
S: Supported
W: https://www.marvell.com/
Q: http://patchwork.ozlabs.org/project/netdev/list/
-F: Documentation/networking/device_drivers/aquantia/atlantic.rst
+F: Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst
F: drivers/net/ethernet/aquantia/atlantic/
AQUANTIA ETHERNET DRIVER PTP SUBSYSTEM
@@ -4733,7 +4733,7 @@ F: net/ax25/sysctl_net_ax25.c
DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
L: netdev@vger.kernel.org
S: Orphan
-F: Documentation/networking/device_drivers/dec/dmfe.rst
+F: Documentation/networking/device_drivers/ethernet/dec/dmfe.rst
F: drivers/net/ethernet/dec/tulip/dmfe.c
DC390/AM53C974 SCSI driver
@@ -5221,8 +5221,8 @@ M: Ioana Ciornei <ioana.ciornei@nxp.com>
M: Ioana Radulescu <ruxandra.radulescu@nxp.com>
L: netdev@vger.kernel.org
S: Maintained
-F: Documentation/networking/device_drivers/freescale/dpaa2/ethernet-
driver.rst
-F: Documentation/networking/device_drivers/freescale/dpaa2/mac-phy-
support.rst
+F:
Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethe
rnet-driver.rst
+F:
Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac
-phy-support.rst
F: drivers/net/ethernet/freescale/dpaa2/Kconfig
F: drivers/net/ethernet/freescale/dpaa2/Makefile
F: drivers/net/ethernet/freescale/dpaa2/dpaa2-eth*
@@ -7282,7 +7282,7 @@ R: Sagi Shahar <sagis@google.com>
R: Jon Olson <jonolson@google.com>
L: netdev@vger.kernel.org
S: Supported
-F: Documentation/networking/device_drivers/google/gve.rst
+F: Documentation/networking/device_drivers/ethernet/google/gve.rst
F: drivers/net/ethernet/google
GPD POCKET FAN DRIVER
@@ -7945,7 +7945,7 @@ S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
F: Documentation/ABI/stable/sysfs-bus-vmbus
F: Documentation/ABI/testing/debugfs-hyperv
-F: Documentation/networking/device_drivers/microsoft/netvsc.rst
+F: Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
F: arch/x86/hyperv
F: arch/x86/include/asm/hyperv-tlfs.h
F: arch/x86/include/asm/mshyperv.h
@@ -8626,18 +8626,18 @@ W: http://e1000.sourceforge.net/
Q: http://patchwork.ozlabs.org/project/intel-wired-lan/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
-F: Documentation/networking/device_drivers/intel/e100.rst
-F: Documentation/networking/device_drivers/intel/e1000.rst
-F: Documentation/networking/device_drivers/intel/e1000e.rst
-F: Documentation/networking/device_drivers/intel/fm10k.rst
-F: Documentation/networking/device_drivers/intel/i40e.rst
-F: Documentation/networking/device_drivers/intel/iavf.rst
-F: Documentation/networking/device_drivers/intel/ice.rst
-F: Documentation/networking/device_drivers/intel/igb.rst
-F: Documentation/networking/device_drivers/intel/igbvf.rst
-F: Documentation/networking/device_drivers/intel/ixgb.rst
-F: Documentation/networking/device_drivers/intel/ixgbe.rst
-F: Documentation/networking/device_drivers/intel/ixgbevf.rst
+F: Documentation/networking/device_drivers/ethernet/intel/e100.rst
+F: Documentation/networking/device_drivers/ethernet/intel/e1000.rst
+F: Documentation/networking/device_drivers/ethernet/intel/e1000e.rst
+F: Documentation/networking/device_drivers/ethernet/intel/fm10k.rst
+F: Documentation/networking/device_drivers/ethernet/intel/i40e.rst
+F: Documentation/networking/device_drivers/ethernet/intel/iavf.rst
+F: Documentation/networking/device_drivers/ethernet/intel/ice.rst
+F: Documentation/networking/device_drivers/ethernet/intel/igb.rst
+F: Documentation/networking/device_drivers/ethernet/intel/igbvf.rst
+F: Documentation/networking/device_drivers/ethernet/intel/ixgb.rst
+F: Documentation/networking/device_drivers/ethernet/intel/ixgbe.rst
+F: Documentation/networking/device_drivers/ethernet/intel/ixgbevf.rst