diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-01-10 14:03:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-01-10 14:03:27 -0500 |
| commit | adec6e14f850cf677796d6571149437f6663b535 (patch) | |
| tree | d8e901bfecaad4bc6172fefcca33bc81162c21e0 /drivers | |
| parent | 5d615b9b160ee9d1de8e41b068462599af57b85d (diff) | |
| download | history-adec6e14f850cf677796d6571149437f6663b535.tar.gz | |
e1000/ixgb net drivers: rename global symbol to fix 'make allyesconfig'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 2 | ||||
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 | ||||
| -rw-r--r-- | drivers/net/ixgb/ixgb_ethtool.c | 2 | ||||
| -rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 9b40cf1c2c9c89..e4061ffc48aaf2 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c @@ -1666,7 +1666,7 @@ struct ethtool_ops e1000_ethtool_ops = { .get_ethtool_stats = e1000_get_ethtool_stats, }; -void set_ethtool_ops(struct net_device *netdev) +void e1000_set_ethtool_ops(struct net_device *netdev) { SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops); } diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 216a5b6eb76a39..aa5ad41acf2459 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -151,7 +151,7 @@ static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter); static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd); static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd); -void set_ethtool_ops(struct net_device *netdev); +void e1000_set_ethtool_ops(struct net_device *netdev); static void e1000_enter_82542_rst(struct e1000_adapter *adapter); static void e1000_leave_82542_rst(struct e1000_adapter *adapter); static void e1000_tx_timeout(struct net_device *dev); @@ -475,7 +475,7 @@ e1000_probe(struct pci_dev *pdev, netdev->set_mac_address = &e1000_set_mac; netdev->change_mtu = &e1000_change_mtu; netdev->do_ioctl = &e1000_ioctl; - set_ethtool_ops(netdev); + e1000_set_ethtool_ops(netdev); netdev->tx_timeout = &e1000_tx_timeout; netdev->watchdog_timeo = 5 * HZ; #ifdef CONFIG_E1000_NAPI diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c index 894b9e8a24142a..e3ba1410af48fb 100644 --- a/drivers/net/ixgb/ixgb_ethtool.c +++ b/drivers/net/ixgb/ixgb_ethtool.c @@ -695,7 +695,7 @@ struct ethtool_ops ixgb_ethtool_ops = { .get_ethtool_stats = ixgb_get_ethtool_stats, }; -void set_ethtool_ops(struct net_device *netdev) +void ixgb_set_ethtool_ops(struct net_device *netdev) { SET_ETHTOOL_OPS(netdev, &ixgb_ethtool_ops); } diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 4252b2fa59994e..435cfa165a5529 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -107,7 +107,7 @@ static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter, static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter); #endif static void ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter); -void set_ethtool_ops(struct net_device *netdev); +void ixgb_set_ethtool_ops(struct net_device *netdev); static void ixgb_tx_timeout(struct net_device *dev); static void ixgb_tx_timeout_task(struct net_device *dev); static void ixgb_vlan_rx_register(struct net_device *netdev, @@ -411,7 +411,7 @@ ixgb_probe(struct pci_dev *pdev, netdev->set_multicast_list = &ixgb_set_multi; netdev->set_mac_address = &ixgb_set_mac; netdev->change_mtu = &ixgb_change_mtu; - set_ethtool_ops(netdev); + ixgb_set_ethtool_ops(netdev); netdev->tx_timeout = &ixgb_tx_timeout; netdev->watchdog_timeo = HZ; #ifdef CONFIG_IXGB_NAPI |