Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6a3d8aa48c1c9d3afc761b862267b9945cc6f281

Authored by Francois Romieu
Committed by David S. Miller
1 parent 38b221957b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

netdev: remove unused S2IO_NAPI 

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 2 additions and 19 deletions Side-by-side Diff

Documentation/networking/s2io.txt
Diff comments   View file @ 6a3d8aa
... ... @@ -52,13 +52,10 @@
52 52 (IA64, Xeon) resulting in noticeable performance improvement(upto 7%
53 53 on certain platforms).
54 54  
55   -e. NAPI. Compile-time option(CONFIG_S2IO_NAPI) for better Rx interrupt
56   -moderation.
57   -
58   -f. Statistics. Comprehensive MAC-level and software statistics displayed
  55 +e. Statistics. Comprehensive MAC-level and software statistics displayed
59 56 using "ethtool -S" option.
60 57  
61   -g. Multi-FIFO/Ring. Supports up to 8 transmit queues and receive rings,
  58 +f. Multi-FIFO/Ring. Supports up to 8 transmit queues and receive rings,
62 59 with multiple steering options.
63 60  
64 61 4. Command line parameters
... ... @@ -2515,20 +2515,6 @@
2515 2515 More specific information on configuring the driver is in
2516 2516 <file:Documentation/networking/s2io.txt>.
2517 2517  
2518   -config S2IO_NAPI
2519   - bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
2520   - depends on S2IO && EXPERIMENTAL
2521   - help
2522   - NAPI is a new driver API designed to reduce CPU and interrupt load
2523   - when the driver is receiving lots of packets from the card. It is
2524   - still somewhat experimental and thus not yet enabled by default.
2525   -
2526   - If your estimated Rx load is 10kpps or more, or if the card will be
2527   - deployed on potentially unfriendly networks (e.g. in a firewall),
2528   - then say Y here.
2529   -
2530   - If in doubt, say N.
2531   -
2532 2518 config MYRI10GE
2533 2519 tristate "Myricom Myri-10G Ethernet support"
2534 2520 depends on PCI && INET