diff options
| author |   Michael Chan <mchan@broadcom.com> | 2012-12-06 10:33:12 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-12-07 12:44:02 -0500 |
| commit | 4bd9b0fffb193d2e288f67f81821af32df8d4349 (patch) | |
| tree | b2e19d3ffeac16974eda2d396f543a1d25466f1c /drivers/net/ethernet/broadcom/cnic_if.h | |
| parent | cnic: Include bnx2x.h (diff) | |
| download | linux-dev-4bd9b0fffb193d2e288f67f81821af32df8d4349.tar.xz linux-dev-4bd9b0fffb193d2e288f67f81821af32df8d4349.zip | |
cnic, bnx2x, bnx2: Simplify cnic probing.
Instead of using symbol_get(), cnic can now directly call the cnic_probe
functions in struct bnx2x and struct bnx2. symbol_get() is not reliable
as it fails when the module is still initializing.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic_if.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic_if.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h index 502e11ef6373..2a35436f9095 100644 --- a/drivers/net/ethernet/broadcom/cnic_if.h +++ b/drivers/net/ethernet/broadcom/cnic_if.h @@ -14,8 +14,8 @@ #include "bnx2x/bnx2x_mfw_req.h" -#define CNIC_MODULE_VERSION "2.5.15" -#define CNIC_MODULE_RELDATE "Dec 04, 2012" +#define CNIC_MODULE_VERSION "2.5.16" +#define CNIC_MODULE_RELDATE "Dec 05, 2012" #define CNIC_ULP_RDMA 0 #define CNIC_ULP_ISCSI 1 @@ -353,7 +353,4 @@ extern int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops); extern int cnic_unregister_driver(int ulp_type); -extern struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev); -extern struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *dev); - #endif |