diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-01-31 06:02:44 +0100 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-31 06:02:44 +0100 |
commit | 84115f0e74ea73eccc44842a125f242a02097493 (patch) | |
tree | e068360a78375d20084e2ad8a156c838c8a4fdb3 /Documentation | |
parent | net: phy: fix null dereference in phy_attach_direct (diff) | |
parent | ice: Fix broken link in ice NAPI doc (diff) | |
download | linux-84115f0e74ea73eccc44842a125f242a02097493.tar.xz linux-84115f0e74ea73eccc44842a125f242a02097493.zip |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says:
====================
Intel Wired LAN Driver Updates 2023-01-27 (ice)
This series contains updates to ice driver only.
Dave prevents modifying channels when RDMA is active as this will break
RDMA traffic.
Michal fixes a broken URL.
* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
ice: Fix broken link in ice NAPI doc
ice: Prevent set_channel from changing queues while RDMA active
====================
Link: https://lore.kernel.org/r/20230127225333.1534783-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/networking/device_drivers/ethernet/intel/ice.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/device_drivers/ethernet/intel/ice.rst b/Documentation/networking/device_drivers/ethernet/intel/ice.rst index dc2e60ced927..b481b81f3be5 100644 --- a/Documentation/networking/device_drivers/ethernet/intel/ice.rst +++ b/Documentation/networking/device_drivers/ethernet/intel/ice.rst @@ -819,7 +819,7 @@ NAPI ---- This driver supports NAPI (Rx polling mode). For more information on NAPI, see -https://www.linuxfoundation.org/collaborate/workgroups/networking/napi +https://wiki.linuxfoundation.org/networking/napi MACVLAN |