Skip to content

Commit

Permalink
bnx2x: store module parameters in driver main structure
Browse files Browse the repository at this point in the history
Store module parameters during initialization of main driver
structure. This will allow access to the parameters from different
files.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dmitry Kravkov authored and David S. Miller committed Jul 28, 2010
1 parent 5d1e859 commit 5d7cd49
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions drivers/net/bnx2x/bnx2x.h
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,8 @@ struct bnx2x {

int multi_mode;
int num_queues;
int disable_tpa;
int int_mode;

u32 rx_mode;
#define BNX2X_RX_MODE_NONE 0
Expand Down
7 changes: 4 additions & 3 deletions drivers/net/bnx2x/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -7878,7 +7878,7 @@ static int bnx2x_set_num_queues(struct bnx2x *bp)
{
int rc = 0;

switch (int_mode) {
switch (bp->int_mode) {
case INT_MODE_INTx:
case INT_MODE_MSI:
bp->num_queues = 1;
Expand Down Expand Up @@ -9951,7 +9951,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
multi_mode = ETH_RSS_MODE_DISABLED;
}
bp->multi_mode = multi_mode;

bp->int_mode = int_mode;

bp->dev->features |= NETIF_F_GRO;

Expand All @@ -9963,6 +9963,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
bp->flags |= TPA_ENABLE_FLAG;
bp->dev->features |= NETIF_F_LRO;
}
bp->disable_tpa = disable_tpa;

if (CHIP_IS_E1(bp))
bp->dropless_fc = 0;
Expand Down Expand Up @@ -11006,7 +11007,7 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)

/* TPA requires Rx CSUM offloading */
if ((data & ETH_FLAG_LRO) && bp->rx_csum) {
if (!disable_tpa) {
if (!bp->disable_tpa) {
if (!(dev->features & NETIF_F_LRO)) {
dev->features |= NETIF_F_LRO;
bp->flags |= TPA_ENABLE_FLAG;
Expand Down

0 comments on commit 5d7cd49

Please sign in to comment.