Commit 5ff8bebb authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-ethernet: drop CONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS 



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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba835c16

drivers/staging/octeon/ethernet-defines.h

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ 
 *      driver will use this memory instead of kernel memory for pools. This

 *      allows 32bit userspace application to access the buffers, but also

 *      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

 *      Tells the driver to populate the packet buffers with kernel skbuffs.

 *      This allows the driver to receive packets without copying them. It also

drivers/staging/octeon/ethernet.c

+1 −7
Original line number Diff line number Diff line
@@ -55,17 +55,11 @@ 
#include <asm/octeon/cvmx-gmxx-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;

#endif

module_param(num_packet_buffers, int, 0444);

MODULE_PARM_DESC(num_packet_buffers, "\n"

	"\tNumber of packet buffers to allocate and store in the\n"

	"\tFPA. By default, 1024 packet buffers are used unless\n"

	"\tCONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS is defined.");

	"\tFPA. By default, 1024 packet buffers are used.\n");



int pow_receive_group = 15;

module_param(pow_receive_group, int, 0444);