diff options
| author | Dmitry Kravkov <dmitry@broadcom.com> | 2010-07-27 12:32:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-27 20:35:40 -0700 |
| commit | 5d7cd49622af9396643f8d2c5ed17039d89fef14 (patch) | |
| tree | bfc2a67d1445474e5b57c6a14702fe593b589641 /drivers/net/bnx2x | |
| parent | 5d1e859c5b600c491336f023a2f2105c24597226 (diff) | |
| download | blackbird-op-linux-5d7cd49622af9396643f8d2c5ed17039d89fef14.tar.gz blackbird-op-linux-5d7cd49622af9396643f8d2c5ed17039d89fef14.zip | |
bnx2x: store module parameters in driver main structure
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>
Diffstat (limited to 'drivers/net/bnx2x')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x.h | 2 | ||||
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 3b51c5f0b0a3..237609f84855 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -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 diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 51b788339c90..1e0ac8bb246f 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -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; @@ -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; @@ -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; @@ -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; |
