aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic
diff options
context:
space:
mode:
authorSritej Velaga <sritej.velaga@qlogic.com>2010-10-04 00:20:15 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-05 01:46:51 -0400
commitaef3d898276e046bfa877cd20b8ee269b85161cd (patch)
tree523df3964b469b991fca11b0f2a1a32b18b4d384 /drivers/net/qlcnic
parenta1c0c459918e8c8ce152deba84f9ed27d7eb0e53 (diff)
qlcnic: cleanup port mode setting
Port mode setting is not required for Qlogic CNA adapters. Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com> Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic')
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c40
1 files changed, 0 insertions, 40 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 59a213814334..4757908b29b5 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -46,11 +46,6 @@ char qlcnic_driver_name[] = "qlcnic";
46static const char qlcnic_driver_string[] = "QLogic 1/10 GbE " 46static const char qlcnic_driver_string[] = "QLogic 1/10 GbE "
47 "Converged/Intelligent Ethernet Driver v" QLCNIC_LINUX_VERSIONID; 47 "Converged/Intelligent Ethernet Driver v" QLCNIC_LINUX_VERSIONID;
48 48
49static int port_mode = QLCNIC_PORT_MODE_AUTO_NEG;
50
51/* Default to restricted 1G auto-neg mode */
52static int wol_port_mode = 5;
53
54static int qlcnic_mac_learn; 49static int qlcnic_mac_learn;
55module_param(qlcnic_mac_learn, int, 0644); 50module_param(qlcnic_mac_learn, int, 0644);
56MODULE_PARM_DESC(qlcnic_mac_learn, "Mac Filter (0=disabled, 1=enabled)"); 51MODULE_PARM_DESC(qlcnic_mac_learn, "Mac Filter (0=disabled, 1=enabled)");
@@ -264,40 +259,6 @@ static void qlcnic_clear_stats(struct qlcnic_adapter *adapter)
264 memset(&adapter->stats, 0, sizeof(adapter->stats)); 259 memset(&adapter->stats, 0, sizeof(adapter->stats));
265} 260}
266 261
267static void qlcnic_set_port_mode(struct qlcnic_adapter *adapter)
268{
269 u32 val, data;
270
271 val = adapter->ahw.board_type;
272 if ((val == QLCNIC_BRDTYPE_P3_HMEZ) ||
273 (val == QLCNIC_BRDTYPE_P3_XG_LOM)) {
274 if (port_mode == QLCNIC_PORT_MODE_802_3_AP) {
275 data = QLCNIC_PORT_MODE_802_3_AP;
276 QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data);
277 } else if (port_mode == QLCNIC_PORT_MODE_XG) {
278 data = QLCNIC_PORT_MODE_XG;
279 QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data);
280 } else if (port_mode == QLCNIC_PORT_MODE_AUTO_NEG_1G) {
281 data = QLCNIC_PORT_MODE_AUTO_NEG_1G;
282 QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data);
283 } else if (port_mode == QLCNIC_PORT_MODE_AUTO_NEG_XG) {
284 data = QLCNIC_PORT_MODE_AUTO_NEG_XG;
285 QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data);
286 } else {
287 data = QLCNIC_PORT_MODE_AUTO_NEG;
288 QLCWR32(adapter, QLCNIC_PORT_MODE_ADDR, data);
289 }
290
291 if ((wol_port_mode != QLCNIC_PORT_MODE_802_3_AP) &&
292 (wol_port_mode != QLCNIC_PORT_MODE_XG) &&
293 (wol_port_mode != QLCNIC_PORT_MODE_AUTO_NEG_1G) &&
294 (wol_port_mode != QLCNIC_PORT_MODE_AUTO_NEG_XG)) {
295 wol_port_mode = QLCNIC_PORT_MODE_AUTO_NEG;
296 }
297 QLCWR32(adapter, QLCNIC_WOL_PORT_MODE, wol_port_mode);
298 }
299}
300
301static void qlcnic_set_msix_bit(struct pci_dev *pdev, int enable) 262static void qlcnic_set_msix_bit(struct pci_dev *pdev, int enable)
302{ 263{
303 u32 control; 264 u32 control;
@@ -1032,7 +993,6 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter)
1032 err = qlcnic_pinit_from_rom(adapter); 993 err = qlcnic_pinit_from_rom(adapter);
1033 if (err) 994 if (err)
1034 goto err_out; 995 goto err_out;
1035 qlcnic_set_port_mode(adapter);
1036 996
1037 err = qlcnic_load_firmware(adapter); 997 err = qlcnic_load_firmware(adapter);
1038 if (err) 998 if (err)