bnx2.c (f01387d2693813eb5271a3448e6a082322c7d75d) bnx2.c (28c4ec0df60c8162c2da48c1df5e1cb2f04cdaa5)
1/* bnx2.c: Broadcom NX2 network driver.
1/* bnx2.c: QLogic NX2 network driver.
2 *
2 *
3 * Copyright (c) 2004-2013 Broadcom Corporation
3 * Copyright (c) 2004-2014 Broadcom Corporation
4 * Copyright (c) 2014 QLogic Corporation
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation.
8 *
9 * Written by: Michael Chan (mchan@broadcom.com)
10 */
11

--- 54 unchanged lines hidden (view full) ---

66#define FW_RV2P_FILE_09 "bnx2/bnx2-rv2p-09-6.0.17.fw"
67
68#define RUN_AT(x) (jiffies + (x))
69
70/* Time in jiffies before concluding the transmitter is hung. */
71#define TX_TIMEOUT (5*HZ)
72
73static char version[] =
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation.
9 *
10 * Written by: Michael Chan (mchan@broadcom.com)
11 */
12

--- 54 unchanged lines hidden (view full) ---

67#define FW_RV2P_FILE_09 "bnx2/bnx2-rv2p-09-6.0.17.fw"
68
69#define RUN_AT(x) (jiffies + (x))
70
71/* Time in jiffies before concluding the transmitter is hung. */
72#define TX_TIMEOUT (5*HZ)
73
74static char version[] =
74 "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
75 "QLogic NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
75
76MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
76
77MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
77MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/5716 Driver");
78MODULE_DESCRIPTION("QLogic NetXtreme II BCM5706/5708/5709/5716 Driver");
78MODULE_LICENSE("GPL");
79MODULE_VERSION(DRV_MODULE_VERSION);
80MODULE_FIRMWARE(FW_MIPS_FILE_06);
81MODULE_FIRMWARE(FW_RV2P_FILE_06);
82MODULE_FIRMWARE(FW_MIPS_FILE_09);
83MODULE_FIRMWARE(FW_RV2P_FILE_09);
84MODULE_FIRMWARE(FW_RV2P_FILE_09_Ax);
85

--- 6825 unchanged lines hidden (view full) ---

6911 if (!(bp->phy_flags & BNX2_PHY_FLAG_SERDES)) {
6912 if (bp->phy_flags & BNX2_PHY_FLAG_MDIX)
6913 cmd->eth_tp_mdix = ETH_TP_MDI_X;
6914 else
6915 cmd->eth_tp_mdix = ETH_TP_MDI;
6916 }
6917 }
6918 else {
79MODULE_LICENSE("GPL");
80MODULE_VERSION(DRV_MODULE_VERSION);
81MODULE_FIRMWARE(FW_MIPS_FILE_06);
82MODULE_FIRMWARE(FW_RV2P_FILE_06);
83MODULE_FIRMWARE(FW_MIPS_FILE_09);
84MODULE_FIRMWARE(FW_RV2P_FILE_09);
85MODULE_FIRMWARE(FW_RV2P_FILE_09_Ax);
86

--- 6825 unchanged lines hidden (view full) ---

6912 if (!(bp->phy_flags & BNX2_PHY_FLAG_SERDES)) {
6913 if (bp->phy_flags & BNX2_PHY_FLAG_MDIX)
6914 cmd->eth_tp_mdix = ETH_TP_MDI_X;
6915 else
6916 cmd->eth_tp_mdix = ETH_TP_MDI;
6917 }
6918 }
6919 else {
6919 ethtool_cmd_speed_set(cmd, -1);
6920 cmd->duplex = -1;
6920 ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
6921 cmd->duplex = DUPLEX_UNKNOWN;
6921 }
6922 spin_unlock_bh(&bp->phy_lock);
6923
6924 cmd->transceiver = XCVR_INTERNAL;
6925 cmd->phy_address = bp->phy_addr;
6926
6927 return 0;
6928}

--- 1890 unchanged lines hidden --- 		6922 }
6923 spin_unlock_bh(&bp->phy_lock);
6924
6925 cmd->transceiver = XCVR_INTERNAL;
6926 cmd->phy_address = bp->phy_addr;
6927
6928 return 0;
6929}

--- 1890 unchanged lines hidden ---