iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: octeon-ethernet: drop CONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS

Browse Source 
We don't have such Kconfig option, so the current code is dead and
the documentation is wrong. Users can adjust this setting by using
module parameter or kernel command line, so we can delete this code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2014-03-02 00:09:05 +02:00 committed by Greg Kroah-Hartman
parent ba835c1615
commit 5ff8bebbd2
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/octeon/ethernet-defines.h
View File

@ -33,10 +33,6 @@
* driver will use this memory instead of kernel memory for pools. This * driver will use this memory instead of kernel memory for pools. This
* allows 32bit userspace application to access the buffers, but also * allows 32bit userspace application to access the buffers, but also
* requires all received packets to be copied. * requires all received packets to be copied.
* CONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS
* This kernel config option allows the user to control the number of
* packet and work queue buffers allocated by the driver. If this is zero,
* the driver uses the default from below.
* USE_SKBUFFS_IN_HW * USE_SKBUFFS_IN_HW
* Tells the driver to populate the packet buffers with kernel skbuffs. * Tells the driver to populate the packet buffers with kernel skbuffs.
* This allows the driver to receive packets without copying them. It also * This allows the driver to receive packets without copying them. It also

8
drivers/staging/octeon/ethernet.c
View File

@ -55,17 +55,11 @@
#include <asm/octeon/cvmx-gmxx-defs.h> #include <asm/octeon/cvmx-gmxx-defs.h>
#include <asm/octeon/cvmx-smix-defs.h> #include <asm/octeon/cvmx-smix-defs.h>
#if defined(CONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS) \
&& CONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS
int num_packet_buffers = CONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS;
#else
int num_packet_buffers = 1024; int num_packet_buffers = 1024;
#endif
module_param(num_packet_buffers, int, 0444); module_param(num_packet_buffers, int, 0444);
MODULE_PARM_DESC(num_packet_buffers, "\n" MODULE_PARM_DESC(num_packet_buffers, "\n"
"\tNumber of packet buffers to allocate and store in the\n" "\tNumber of packet buffers to allocate and store in the\n"
"\tFPA. By default, 1024 packet buffers are used unless\n" "\tFPA. By default, 1024 packet buffers are used.\n");
"\tCONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS is defined.");
int pow_receive_group = 15; int pow_receive_group = 15;
module_param(pow_receive_group, int, 0444); module_param(pow_receive_group, int, 0444);