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>

diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 3b51c5f0b0a361c112660d4da341e36a03a93e82..237609f84855dfd97cd59ae6a8ff9ba5d70d17a1 100644 (file)
--- 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 51b788339c903fda0c434f418db564cbb272b341..1e0ac8bb246fa01a78fd20d293afbbcbf27200cf 100644 (file)
--- 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;