aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlge/qlge_main.c
diff options
context:
space:
mode:
authorRon Mercer <ron.mercer@qlogic.com>2009-10-30 08:13:34 -0400
committerDavid S. Miller <davem@davemloft.net>2009-11-02 07:25:42 -0500
commit01e6b953ada927093c4d162f634200a20323c537 (patch)
tree1667b6fc8155a8461506bd44b8cb02cd1cd0dac2 /drivers/net/qlge/qlge_main.c
parent9dfbbaa6b0b9f7c4d6c9dc3a59006f44e6521138 (diff)
qlge: Change naming on vlan API.
Change name on vlan_rx_add, kill, register to match other driver API. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge/qlge_main.c')
-rw-r--r--drivers/net/qlge/qlge_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 4de054505ec..fa53009bda2 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -1985,7 +1985,7 @@ static int ql_napi_poll_msix(struct napi_struct *napi, int budget)
1985 return work_done; 1985 return work_done;
1986} 1986}
1987 1987
1988static void ql_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp) 1988static void qlge_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp)
1989{ 1989{
1990 struct ql_adapter *qdev = netdev_priv(ndev); 1990 struct ql_adapter *qdev = netdev_priv(ndev);
1991 1991
@@ -2001,7 +2001,7 @@ static void ql_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp)
2001 } 2001 }
2002} 2002}
2003 2003
2004static void ql_vlan_rx_add_vid(struct net_device *ndev, u16 vid) 2004static void qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid)
2005{ 2005{
2006 struct ql_adapter *qdev = netdev_priv(ndev); 2006 struct ql_adapter *qdev = netdev_priv(ndev);
2007 u32 enable_bit = MAC_ADDR_E; 2007 u32 enable_bit = MAC_ADDR_E;
@@ -2017,7 +2017,7 @@ static void ql_vlan_rx_add_vid(struct net_device *ndev, u16 vid)
2017 ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK); 2017 ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);
2018} 2018}
2019 2019
2020static void ql_vlan_rx_kill_vid(struct net_device *ndev, u16 vid) 2020static void qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)
2021{ 2021{
2022 struct ql_adapter *qdev = netdev_priv(ndev); 2022 struct ql_adapter *qdev = netdev_priv(ndev);
2023 u32 enable_bit = 0; 2023 u32 enable_bit = 0;
@@ -4192,9 +4192,9 @@ static const struct net_device_ops qlge_netdev_ops = {
4192 .ndo_set_mac_address = qlge_set_mac_address, 4192 .ndo_set_mac_address = qlge_set_mac_address,
4193 .ndo_validate_addr = eth_validate_addr, 4193 .ndo_validate_addr = eth_validate_addr,
4194 .ndo_tx_timeout = qlge_tx_timeout, 4194 .ndo_tx_timeout = qlge_tx_timeout,
4195 .ndo_vlan_rx_register = ql_vlan_rx_register, 4195 .ndo_vlan_rx_register = qlge_vlan_rx_register,
4196 .ndo_vlan_rx_add_vid = ql_vlan_rx_add_vid, 4196 .ndo_vlan_rx_add_vid = qlge_vlan_rx_add_vid,
4197 .ndo_vlan_rx_kill_vid = ql_vlan_rx_kill_vid, 4197 .ndo_vlan_rx_kill_vid = qlge_vlan_rx_kill_vid,
4198}; 4198};
4199 4199
4200static int __devinit qlge_probe(struct pci_dev *pdev, 4200static int __devinit qlge_probe(struct pci_dev *pdev,