Commit adec6e14 authored by Jeff Garzik's avatar Jeff Garzik

e1000/ixgb net drivers: rename global symbol to fix 'make allyesconfig'

parent 5d615b9b
...@@ -1666,7 +1666,7 @@ struct ethtool_ops e1000_ethtool_ops = { ...@@ -1666,7 +1666,7 @@ struct ethtool_ops e1000_ethtool_ops = {
.get_ethtool_stats = e1000_get_ethtool_stats, .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); SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
} }
...@@ -151,7 +151,7 @@ static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter); ...@@ -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_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
int cmd); 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_enter_82542_rst(struct e1000_adapter *adapter);
static void e1000_leave_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); static void e1000_tx_timeout(struct net_device *dev);
...@@ -475,7 +475,7 @@ e1000_probe(struct pci_dev *pdev, ...@@ -475,7 +475,7 @@ e1000_probe(struct pci_dev *pdev,
netdev->set_mac_address = &e1000_set_mac; netdev->set_mac_address = &e1000_set_mac;
netdev->change_mtu = &e1000_change_mtu; netdev->change_mtu = &e1000_change_mtu;
netdev->do_ioctl = &e1000_ioctl; netdev->do_ioctl = &e1000_ioctl;
set_ethtool_ops(netdev); e1000_set_ethtool_ops(netdev);
netdev->tx_timeout = &e1000_tx_timeout; netdev->tx_timeout = &e1000_tx_timeout;
netdev->watchdog_timeo = 5 * HZ; netdev->watchdog_timeo = 5 * HZ;
#ifdef CONFIG_E1000_NAPI #ifdef CONFIG_E1000_NAPI
......
...@@ -695,7 +695,7 @@ struct ethtool_ops ixgb_ethtool_ops = { ...@@ -695,7 +695,7 @@ struct ethtool_ops ixgb_ethtool_ops = {
.get_ethtool_stats = ixgb_get_ethtool_stats, .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); SET_ETHTOOL_OPS(netdev, &ixgb_ethtool_ops);
} }
...@@ -107,7 +107,7 @@ static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter, ...@@ -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); static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter);
#endif #endif
static void ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter); 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(struct net_device *dev);
static void ixgb_tx_timeout_task(struct net_device *dev); static void ixgb_tx_timeout_task(struct net_device *dev);
static void ixgb_vlan_rx_register(struct net_device *netdev, static void ixgb_vlan_rx_register(struct net_device *netdev,
...@@ -411,7 +411,7 @@ ixgb_probe(struct pci_dev *pdev, ...@@ -411,7 +411,7 @@ ixgb_probe(struct pci_dev *pdev,
netdev->set_multicast_list = &ixgb_set_multi; netdev->set_multicast_list = &ixgb_set_multi;
netdev->set_mac_address = &ixgb_set_mac; netdev->set_mac_address = &ixgb_set_mac;
netdev->change_mtu = &ixgb_change_mtu; netdev->change_mtu = &ixgb_change_mtu;
set_ethtool_ops(netdev); ixgb_set_ethtool_ops(netdev);
netdev->tx_timeout = &ixgb_tx_timeout; netdev->tx_timeout = &ixgb_tx_timeout;
netdev->watchdog_timeo = HZ; netdev->watchdog_timeo = HZ;
#ifdef CONFIG_IXGB_NAPI #ifdef CONFIG_IXGB_NAPI
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment