Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01e6b953 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: Change naming on vlan API. 



Change name on vlan_rx_add, kill, register to match other driver API.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dfbbaa6

drivers/net/qlge/qlge_main.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1985,7 +1985,7 @@ static int ql_napi_poll_msix(struct napi_struct *napi, int budget) 
	return work_done;

	return work_done;

}

}





static void ql_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp)

static void qlge_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp)

{

{

	struct ql_adapter *qdev = netdev_priv(ndev);

	struct ql_adapter *qdev = netdev_priv(ndev);
@@ -2001,7 +2001,7 @@ static void ql_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp) 
	}

	}

}

}





static void ql_vlan_rx_add_vid(struct net_device *ndev, u16 vid)

static void qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid)

{

{

	struct ql_adapter *qdev = netdev_priv(ndev);

	struct ql_adapter *qdev = netdev_priv(ndev);

	u32 enable_bit = MAC_ADDR_E;

	u32 enable_bit = MAC_ADDR_E;
@@ -2017,7 +2017,7 @@ static void ql_vlan_rx_add_vid(struct net_device *ndev, u16 vid) 
	ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);

	ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);

}

}





static void ql_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)

static void qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)

{

{

	struct ql_adapter *qdev = netdev_priv(ndev);

	struct ql_adapter *qdev = netdev_priv(ndev);

	u32 enable_bit = 0;

	u32 enable_bit = 0;
@@ -4192,9 +4192,9 @@ static const struct net_device_ops qlge_netdev_ops = { 
	.ndo_set_mac_address	= qlge_set_mac_address,

	.ndo_set_mac_address	= qlge_set_mac_address,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_tx_timeout		= qlge_tx_timeout,

	.ndo_tx_timeout		= qlge_tx_timeout,

	.ndo_vlan_rx_register	= ql_vlan_rx_register,

	.ndo_vlan_rx_register	= qlge_vlan_rx_register,

	.ndo_vlan_rx_add_vid	= ql_vlan_rx_add_vid,

	.ndo_vlan_rx_add_vid	= qlge_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= ql_vlan_rx_kill_vid,

	.ndo_vlan_rx_kill_vid	= qlge_vlan_rx_kill_vid,

};

};





static int __devinit qlge_probe(struct pci_dev *pdev,

static int __devinit qlge_probe(struct pci_dev *pdev,