diff options
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 2f6a19bfad5..940ef859dc6 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -9487,8 +9487,7 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp) | |||
9487 | #define BNX2X_PREV_UNDI_BD(val) ((val) >> 16 & 0xffff) | 9487 | #define BNX2X_PREV_UNDI_BD(val) ((val) >> 16 & 0xffff) |
9488 | #define BNX2X_PREV_UNDI_PROD(rcq, bd) ((bd) << 16 | (rcq)) | 9488 | #define BNX2X_PREV_UNDI_PROD(rcq, bd) ((bd) << 16 | (rcq)) |
9489 | 9489 | ||
9490 | static void bnx2x_prev_unload_undi_inc(struct bnx2x *bp, u8 port, | 9490 | static void bnx2x_prev_unload_undi_inc(struct bnx2x *bp, u8 port, u8 inc) |
9491 | u8 inc) | ||
9492 | { | 9491 | { |
9493 | u16 rcq, bd; | 9492 | u16 rcq, bd; |
9494 | u32 tmp_reg = REG_RD(bp, BNX2X_PREV_UNDI_PROD_ADDR(port)); | 9493 | u32 tmp_reg = REG_RD(bp, BNX2X_PREV_UNDI_PROD_ADDR(port)); |
@@ -10072,8 +10071,7 @@ static int bnx2x_get_igu_cam_info(struct bnx2x *bp) | |||
10072 | return 0; | 10071 | return 0; |
10073 | } | 10072 | } |
10074 | 10073 | ||
10075 | static void bnx2x_link_settings_supported(struct bnx2x *bp, | 10074 | static void bnx2x_link_settings_supported(struct bnx2x *bp, u32 switch_cfg) |
10076 | u32 switch_cfg) | ||
10077 | { | 10075 | { |
10078 | int cfg_size = 0, idx, port = BP_PORT(bp); | 10076 | int cfg_size = 0, idx, port = BP_PORT(bp); |
10079 | 10077 | ||
@@ -11553,9 +11551,8 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp) | |||
11553 | return 0; | 11551 | return 0; |
11554 | } | 11552 | } |
11555 | 11553 | ||
11556 | static int bnx2x_init_dev(struct pci_dev *pdev, | 11554 | static int bnx2x_init_dev(struct pci_dev *pdev, struct net_device *dev, |
11557 | struct net_device *dev, | 11555 | unsigned long board_type) |
11558 | unsigned long board_type) | ||
11559 | { | 11556 | { |
11560 | struct bnx2x *bp; | 11557 | struct bnx2x *bp; |
11561 | int rc; | 11558 | int rc; |
@@ -11735,8 +11732,7 @@ err_out: | |||
11735 | return rc; | 11732 | return rc; |
11736 | } | 11733 | } |
11737 | 11734 | ||
11738 | static void bnx2x_get_pcie_width_speed(struct bnx2x *bp, | 11735 | static void bnx2x_get_pcie_width_speed(struct bnx2x *bp, int *width, int *speed) |
11739 | int *width, int *speed) | ||
11740 | { | 11736 | { |
11741 | u32 val = REG_RD(bp, PCICFG_OFFSET + PCICFG_LINK_CONTROL); | 11737 | u32 val = REG_RD(bp, PCICFG_OFFSET + PCICFG_LINK_CONTROL); |
11742 | 11738 | ||
@@ -12042,8 +12038,7 @@ static int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev, | |||
12042 | 12038 | ||
12043 | struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *); | 12039 | struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *); |
12044 | 12040 | ||
12045 | static int bnx2x_init_one(struct pci_dev *pdev, | 12041 | static int bnx2x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
12046 | const struct pci_device_id *ent) | ||
12047 | { | 12042 | { |
12048 | struct net_device *dev = NULL; | 12043 | struct net_device *dev = NULL; |
12049 | struct bnx2x *bp; | 12044 | struct bnx2x *bp; |