diff options
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ctx.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_ctx.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c index 12612127a087..f16966afa64e 100644 --- a/drivers/net/netxen/netxen_nic_ctx.c +++ b/drivers/net/netxen/netxen_nic_ctx.c | |||
@@ -112,6 +112,21 @@ nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu) | |||
112 | return 0; | 112 | return 0; |
113 | } | 113 | } |
114 | 114 | ||
115 | int | ||
116 | nx_fw_cmd_set_gbe_port(struct netxen_adapter *adapter, | ||
117 | u32 speed, u32 duplex, u32 autoneg) | ||
118 | { | ||
119 | |||
120 | return netxen_issue_cmd(adapter, | ||
121 | adapter->ahw.pci_func, | ||
122 | NXHAL_VERSION, | ||
123 | speed, | ||
124 | duplex, | ||
125 | autoneg, | ||
126 | NX_CDRP_CMD_CONFIG_GBE_PORT); | ||
127 | |||
128 | } | ||
129 | |||
115 | static int | 130 | static int |
116 | nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter) | 131 | nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter) |
117 | { | 132 | { |
@@ -255,19 +270,6 @@ out_free_rq: | |||
255 | } | 270 | } |
256 | 271 | ||
257 | static void | 272 | static void |
258 | nx_fw_cmd_reset_ctx(struct netxen_adapter *adapter) | ||
259 | { | ||
260 | |||
261 | netxen_issue_cmd(adapter, adapter->ahw.pci_func, NXHAL_VERSION, | ||
262 | adapter->ahw.pci_func, NX_DESTROY_CTX_RESET, 0, | ||
263 | NX_CDRP_CMD_DESTROY_RX_CTX); | ||
264 | |||
265 | netxen_issue_cmd(adapter, adapter->ahw.pci_func, NXHAL_VERSION, | ||
266 | adapter->ahw.pci_func, NX_DESTROY_CTX_RESET, 0, | ||
267 | NX_CDRP_CMD_DESTROY_TX_CTX); | ||
268 | } | ||
269 | |||
270 | static void | ||
271 | nx_fw_cmd_destroy_rx_ctx(struct netxen_adapter *adapter) | 273 | nx_fw_cmd_destroy_rx_ctx(struct netxen_adapter *adapter) |
272 | { | 274 | { |
273 | struct netxen_recv_context *recv_ctx = &adapter->recv_ctx; | 275 | struct netxen_recv_context *recv_ctx = &adapter->recv_ctx; |
@@ -698,8 +700,6 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) | |||
698 | if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) { | 700 | if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) { |
699 | if (test_and_set_bit(__NX_FW_ATTACHED, &adapter->state)) | 701 | if (test_and_set_bit(__NX_FW_ATTACHED, &adapter->state)) |
700 | goto done; | 702 | goto done; |
701 | if (reset_devices) | ||
702 | nx_fw_cmd_reset_ctx(adapter); | ||
703 | err = nx_fw_cmd_create_rx_ctx(adapter); | 703 | err = nx_fw_cmd_create_rx_ctx(adapter); |
704 | if (err) | 704 | if (err) |
705 | goto err_out_free; | 705 | goto err_out_free; |