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

Commit 70eb1bfd authored by David S. Miller's avatar David S. Miller
Browse files

axnet_cs: Fix build after net device ops ne2k conversion. 



Commit 4e4fd4e4 ("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: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f756a8c

drivers/net/pcmcia/axnet_cs.c

+8 −8
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ int ei_debug = 1; 
/* Index to functions. */

static void ei_tx_intr(struct net_device *dev);

static void ei_tx_err(struct net_device *dev);

static void ei_tx_timeout(struct net_device *dev);

static void axnet_tx_timeout(struct net_device *dev);

static void ei_receive(struct net_device *dev);

static void ei_rx_overrun(struct net_device *dev);
@@ -955,9 +955,9 @@ static int ax_open(struct net_device *dev) 


#ifdef HAVE_TX_TIMEOUT

	/* The card I/O part of the driver (e.g. 3c503) can hook a Tx timeout

	    wrapper that does e.g. media check & then calls ei_tx_timeout. */

	    wrapper that does e.g. media check & then calls axnet_tx_timeout. */

	if (dev->tx_timeout == NULL)

		 dev->tx_timeout = ei_tx_timeout;

		 dev->tx_timeout = axnet_tx_timeout;

	if (dev->watchdog_timeo <= 0)

		 dev->watchdog_timeo = TX_TIMEOUT;

#endif
@@ -1001,14 +1001,14 @@ static int ax_close(struct net_device *dev) 
}



/**

 * ei_tx_timeout - handle transmit time out condition

 * axnet_tx_timeout - handle transmit time out condition

 * @dev: network device which has apparently fallen asleep

 *

 * Called by kernel when device never acknowledges a transmit has

 * completed (or failed) - i.e. never posted a Tx related interrupt.

 */



static void ei_tx_timeout(struct net_device *dev)

static void axnet_tx_timeout(struct net_device *dev)

{

	long e8390_base = dev->base_addr;

	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
@@ -1045,14 +1045,14 @@ static void ei_tx_timeout(struct net_device *dev) 
}

    

/**

 * ei_start_xmit - begin packet transmission

 * axnet_start_xmit - begin packet transmission

 * @skb: packet to be sent

 * @dev: network device to which packet is sent

 *

 * Sends a packet to an 8390 network device.

 */

 

static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)

static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	long e8390_base = dev->base_addr;

	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
@@ -1718,7 +1718,7 @@ static void axdev_setup(struct net_device *dev) 
	ei_local = (struct ei_device *)netdev_priv(dev);

	spin_lock_init(&ei_local->page_lock);

    

	dev->hard_start_xmit = &ei_start_xmit;

	dev->hard_start_xmit = &axnet_start_xmit;

	dev->get_stats	= get_stats;

	dev->set_multicast_list = &set_multicast_list;