aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-23 23:01:59 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-23 23:01:59 -0500
commit70eb1bfd52e97120eddf9b5aaabfe1ecdf4eb663 (patch)
treee0123387eaea3111876c793da672e96bc09592a1
parent6f756a8c36bf54d0afb1d457082b3e3033d951a7 (diff)
axnet_cs: Fix build after net device ops ne2k conversion.
Commit 4e4fd4e485ad63a9074ff09a9b53ffc7a5c594ec ("ne2k: convert to net_device_ops") exported some ei_* symbols from the 8390 library, but the axnet_cs driver defines local static versions of the same functions. Rename them to avoid the namespace conflict. Reported by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/pcmcia/axnet_cs.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 2aca8df34970..c9890b4a8a32 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -904,7 +904,7 @@ int ei_debug = 1;
904/* Index to functions. */ 904/* Index to functions. */
905static void ei_tx_intr(struct net_device *dev); 905static void ei_tx_intr(struct net_device *dev);
906static void ei_tx_err(struct net_device *dev); 906static void ei_tx_err(struct net_device *dev);
907static void ei_tx_timeout(struct net_device *dev); 907static void axnet_tx_timeout(struct net_device *dev);
908static void ei_receive(struct net_device *dev); 908static void ei_receive(struct net_device *dev);
909static void ei_rx_overrun(struct net_device *dev); 909static void ei_rx_overrun(struct net_device *dev);
910 910
@@ -955,9 +955,9 @@ static int ax_open(struct net_device *dev)
955 955
956#ifdef HAVE_TX_TIMEOUT 956#ifdef HAVE_TX_TIMEOUT
957 /* The card I/O part of the driver (e.g. 3c503) can hook a Tx timeout 957 /* The card I/O part of the driver (e.g. 3c503) can hook a Tx timeout
958 wrapper that does e.g. media check & then calls ei_tx_timeout. */ 958 wrapper that does e.g. media check & then calls axnet_tx_timeout. */
959 if (dev->tx_timeout == NULL) 959 if (dev->tx_timeout == NULL)
960 dev->tx_timeout = ei_tx_timeout; 960 dev->tx_timeout = axnet_tx_timeout;
961 if (dev->watchdog_timeo <= 0) 961 if (dev->watchdog_timeo <= 0)
962 dev->watchdog_timeo = TX_TIMEOUT; 962 dev->watchdog_timeo = TX_TIMEOUT;
963#endif 963#endif
@@ -1001,14 +1001,14 @@ static int ax_close(struct net_device *dev)
1001} 1001}
1002 1002
1003/** 1003/**
1004 * ei_tx_timeout - handle transmit time out condition 1004 * axnet_tx_timeout - handle transmit time out condition
1005 * @dev: network device which has apparently fallen asleep 1005 * @dev: network device which has apparently fallen asleep
1006 * 1006 *
1007 * Called by kernel when device never acknowledges a transmit has 1007 * Called by kernel when device never acknowledges a transmit has
1008 * completed (or failed) - i.e. never posted a Tx related interrupt. 1008 * completed (or failed) - i.e. never posted a Tx related interrupt.
1009 */ 1009 */
1010 1010
1011static void ei_tx_timeout(struct net_device *dev) 1011static void axnet_tx_timeout(struct net_device *dev)
1012{ 1012{
1013 long e8390_base = dev->base_addr; 1013 long e8390_base = dev->base_addr;
1014 struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); 1014 struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
@@ -1045,14 +1045,14 @@ static void ei_tx_timeout(struct net_device *dev)
1045} 1045}
1046 1046
1047/** 1047/**
1048 * ei_start_xmit - begin packet transmission 1048 * axnet_start_xmit - begin packet transmission
1049 * @skb: packet to be sent 1049 * @skb: packet to be sent
1050 * @dev: network device to which packet is sent 1050 * @dev: network device to which packet is sent
1051 * 1051 *
1052 * Sends a packet to an 8390 network device. 1052 * Sends a packet to an 8390 network device.
1053 */ 1053 */
1054 1054
1055static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) 1055static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
1056{ 1056{
1057 long e8390_base = dev->base_addr; 1057 long e8390_base = dev->base_addr;
1058 struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); 1058 struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
@@ -1718,7 +1718,7 @@ static void axdev_setup(struct net_device *dev)
1718 ei_local = (struct ei_device *)netdev_priv(dev); 1718 ei_local = (struct ei_device *)netdev_priv(dev);
1719 spin_lock_init(&ei_local->page_lock); 1719 spin_lock_init(&ei_local->page_lock);
1720 1720
1721 dev->hard_start_xmit = &ei_start_xmit; 1721 dev->hard_start_xmit = &axnet_start_xmit;
1722 dev->get_stats = get_stats; 1722 dev->get_stats = get_stats;
1723 dev->set_multicast_list = &set_multicast_list; 1723 dev->set_multicast_list = &set_multicast_list;
1724 1724