diff options
author | Merav Sicron <meravs@broadcom.com> | 2012-11-06 19:45:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-07 18:57:19 -0500 |
commit | 55c11941e382cb26010138ab824216f47af37606 (patch) | |
tree | 92724ef130081b47426919758c5fac4061e9e708 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | |
parent | babc6727d537199f7fbf6dfe711ae418d399b3eb (diff) |
bnx2x: Support loading cnic resources at run-time
This patch replaces the BCM_CNIC define with a flag which can change at run-time
and which does not use the CONFIG_CNIC kconfig option.
For the PF/hypervisor driver cnic is always supported, however allocation of
cnic resources and configuration of the HW for offload mode is done only when
the cnic module registers bnx2x.
Signed-off-by: Merav Sicron <meravs@broadcom.com>
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/ethernet/broadcom/bnx2x/bnx2x_link.h')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h index 9165b89a4b19..ba981ced628b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | |||
@@ -432,7 +432,8 @@ int bnx2x_phy_probe(struct link_params *params); | |||
432 | u8 bnx2x_fan_failure_det_req(struct bnx2x *bp, u32 shmem_base, | 432 | u8 bnx2x_fan_failure_det_req(struct bnx2x *bp, u32 shmem_base, |
433 | u32 shmem2_base, u8 port); | 433 | u32 shmem2_base, u8 port); |
434 | 434 | ||
435 | 435 | /* Open / close the gate between the NIG and the BRB */ | |
436 | void bnx2x_set_rx_filter(struct link_params *params, u8 en); | ||
436 | 437 | ||
437 | /* DCBX structs */ | 438 | /* DCBX structs */ |
438 | 439 | ||