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/bnx2.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/bnx2.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h index 38a640df58f7..172efbecfea2 100644 --- a/drivers/net/ethernet/broadcom/bnx2.h +++ b/drivers/net/ethernet/broadcom/bnx2.h @@ -6984,6 +6984,7 @@ struct bnx2 { #ifdef BCM_CNIC struct mutex cnic_lock; struct cnic_eth_dev cnic_eth_dev; + struct cnic_eth_dev *(*cnic_probe)(struct net_device *); #endif const struct firmware *mips_firmware; |