diff options
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.h')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.h b/drivers/net/netxen/netxen_nic_hw.h index ab1112eb1b0d..841341d52dce 100644 --- a/drivers/net/netxen/netxen_nic_hw.h +++ b/drivers/net/netxen/netxen_nic_hw.h | |||
@@ -6,12 +6,12 @@ | |||
6 | * modify it under the terms of the GNU General Public License | 6 | * modify it under the terms of the GNU General Public License |
7 | * as published by the Free Software Foundation; either version 2 | 7 | * as published by the Free Software Foundation; either version 2 |
8 | * of the License, or (at your option) any later version. | 8 | * of the License, or (at your option) any later version. |
9 | * | 9 | * |
10 | * This program is distributed in the hope that it will be useful, but | 10 | * This program is distributed in the hope that it will be useful, but |
11 | * WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | * GNU General Public License for more details. | 13 | * GNU General Public License for more details. |
14 | * | 14 | * |
15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
16 | * along with this program; if not, write to the Free Software | 16 | * along with this program; if not, write to the Free Software |
17 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 17 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, |
@@ -87,7 +87,7 @@ struct netxen_adapter; | |||
87 | *(u32 *)Y = readl((void __iomem*) addr); | 87 | *(u32 *)Y = readl((void __iomem*) addr); |
88 | 88 | ||
89 | struct netxen_port; | 89 | struct netxen_port; |
90 | void netxen_nic_set_link_parameters(struct netxen_port *port); | 90 | void netxen_nic_set_link_parameters(struct netxen_adapter *adapter); |
91 | void netxen_nic_flash_print(struct netxen_adapter *adapter); | 91 | void netxen_nic_flash_print(struct netxen_adapter *adapter); |
92 | int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off, | 92 | int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off, |
93 | void *data, int len); | 93 | void *data, int len); |
@@ -452,21 +452,21 @@ typedef enum { | |||
452 | ((config) |= (((val) & 0x0f) << 28)) | 452 | ((config) |= (((val) & 0x0f) << 28)) |
453 | 453 | ||
454 | /* Set promiscuous mode for a GbE interface */ | 454 | /* Set promiscuous mode for a GbE interface */ |
455 | int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, int port, | 455 | int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, |
456 | netxen_niu_prom_mode_t mode); | 456 | netxen_niu_prom_mode_t mode); |
457 | int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter, | 457 | int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter, |
458 | int port, netxen_niu_prom_mode_t mode); | 458 | netxen_niu_prom_mode_t mode); |
459 | 459 | ||
460 | /* get/set the MAC address for a given MAC */ | 460 | /* get/set the MAC address for a given MAC */ |
461 | int netxen_niu_macaddr_get(struct netxen_adapter *adapter, int port, | 461 | int netxen_niu_macaddr_get(struct netxen_adapter *adapter, int port, |
462 | netxen_ethernet_macaddr_t * addr); | 462 | netxen_ethernet_macaddr_t * addr); |
463 | int netxen_niu_macaddr_set(struct netxen_port *port, | 463 | int netxen_niu_macaddr_set(struct netxen_adapter *adapter, |
464 | netxen_ethernet_macaddr_t addr); | 464 | netxen_ethernet_macaddr_t addr); |
465 | 465 | ||
466 | /* XG versons */ | 466 | /* XG versons */ |
467 | int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter, int port, | 467 | int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter, int port, |
468 | netxen_ethernet_macaddr_t * addr); | 468 | netxen_ethernet_macaddr_t * addr); |
469 | int netxen_niu_xg_macaddr_set(struct netxen_port *port, | 469 | int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter, |
470 | netxen_ethernet_macaddr_t addr); | 470 | netxen_ethernet_macaddr_t addr); |
471 | 471 | ||
472 | /* Generic enable for GbE ports. Will detect the speed of the link. */ | 472 | /* Generic enable for GbE ports. Will detect the speed of the link. */ |
@@ -475,8 +475,8 @@ int netxen_niu_gbe_init_port(struct netxen_adapter *adapter, int port); | |||
475 | int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port); | 475 | int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port); |
476 | 476 | ||
477 | /* Disable a GbE interface */ | 477 | /* Disable a GbE interface */ |
478 | int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter, int port); | 478 | int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter); |
479 | 479 | ||
480 | int netxen_niu_disable_xg_port(struct netxen_adapter *adapter, int port); | 480 | int netxen_niu_disable_xg_port(struct netxen_adapter *adapter); |
481 | 481 | ||
482 | #endif /* __NETXEN_NIC_HW_H_ */ | 482 | #endif /* __NETXEN_NIC_HW_H_ */ |