|
@@ -108,14 +108,13 @@ 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);
|
|
|
+void ei_tx_timeout(struct net_device *dev);
|
|
|
static void ei_receive(struct net_device *dev);
|
|
|
static void ei_rx_overrun(struct net_device *dev);
|
|
|
|
|
|
/* Routines generic to NS8390-based boards. */
|
|
|
static void NS8390_trigger_send(struct net_device *dev, unsigned int length,
|
|
|
int start_page);
|
|
|
-static void set_multicast_list(struct net_device *dev);
|
|
|
static void do_set_multicast_list(struct net_device *dev);
|
|
|
static void __NS8390_init(struct net_device *dev, int startp);
|
|
|
|
|
@@ -208,8 +207,10 @@ static int __ei_open(struct net_device *dev)
|
|
|
|
|
|
/* 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. */
|
|
|
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
|
|
|
if (dev->tx_timeout == NULL)
|
|
|
dev->tx_timeout = ei_tx_timeout;
|
|
|
+#endif
|
|
|
if (dev->watchdog_timeo <= 0)
|
|
|
dev->watchdog_timeo = TX_TIMEOUT;
|
|
|
|
|
@@ -258,7 +259,7 @@ static int __ei_close(struct net_device *dev)
|
|
|
* completed (or failed) - i.e. never posted a Tx related interrupt.
|
|
|
*/
|
|
|
|
|
|
-static void ei_tx_timeout(struct net_device *dev)
|
|
|
+void ei_tx_timeout(struct net_device *dev)
|
|
|
{
|
|
|
unsigned long e8390_base = dev->base_addr;
|
|
|
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
|
|
@@ -295,6 +296,7 @@ static void ei_tx_timeout(struct net_device *dev)
|
|
|
enable_irq_lockdep(dev->irq);
|
|
|
netif_wake_queue(dev);
|
|
|
}
|
|
|
+EXPORT_SYMBOL_GPL(ei_tx_timeout);
|
|
|
|
|
|
/**
|
|
|
* ei_start_xmit - begin packet transmission
|
|
@@ -304,7 +306,7 @@ static void ei_tx_timeout(struct net_device *dev)
|
|
|
* Sends a packet to an 8390 network device.
|
|
|
*/
|
|
|
|
|
|
-static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
+int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
{
|
|
|
unsigned long e8390_base = dev->base_addr;
|
|
|
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
|
|
@@ -421,6 +423,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+EXPORT_SYMBOL_GPL(ei_start_xmit);
|
|
|
|
|
|
/**
|
|
|
* ei_interrupt - handle the interrupts from an 8390
|
|
@@ -882,7 +885,7 @@ static void ei_rx_overrun(struct net_device *dev)
|
|
|
* Collect the stats. This is called unlocked and from several contexts.
|
|
|
*/
|
|
|
|
|
|
-static struct net_device_stats *get_stats(struct net_device *dev)
|
|
|
+struct net_device_stats *ei_get_stats(struct net_device *dev)
|
|
|
{
|
|
|
unsigned long ioaddr = dev->base_addr;
|
|
|
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
|
|
@@ -901,6 +904,7 @@ static struct net_device_stats *get_stats(struct net_device *dev)
|
|
|
|
|
|
return &dev->stats;
|
|
|
}
|
|
|
+EXPORT_SYMBOL_GPL(ei_get_stats);
|
|
|
|
|
|
/*
|
|
|
* Form the 64 bit 8390 multicast table from the linked list of addresses
|
|
@@ -991,7 +995,7 @@ static void do_set_multicast_list(struct net_device *dev)
|
|
|
* not called too often. Must protect against both bh and irq users
|
|
|
*/
|
|
|
|
|
|
-static void set_multicast_list(struct net_device *dev)
|
|
|
+void ei_set_multicast_list(struct net_device *dev)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
struct ei_device *ei_local = (struct ei_device*)netdev_priv(dev);
|
|
@@ -1000,6 +1004,7 @@ static void set_multicast_list(struct net_device *dev)
|
|
|
do_set_multicast_list(dev);
|
|
|
spin_unlock_irqrestore(&ei_local->page_lock, flags);
|
|
|
}
|
|
|
+EXPORT_SYMBOL_GPL(ei_set_multicast_list);
|
|
|
|
|
|
/**
|
|
|
* ethdev_setup - init rest of 8390 device struct
|
|
@@ -1015,10 +1020,11 @@ static void ethdev_setup(struct net_device *dev)
|
|
|
if (ei_debug > 1)
|
|
|
printk(version);
|
|
|
|
|
|
- dev->hard_start_xmit = &ei_start_xmit;
|
|
|
- dev->get_stats = get_stats;
|
|
|
- dev->set_multicast_list = &set_multicast_list;
|
|
|
-
|
|
|
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
|
|
|
+ dev->hard_start_xmit = ei_start_xmit;
|
|
|
+ dev->get_stats = ei_get_stats;
|
|
|
+ dev->set_multicast_list = ei_set_multicast_list;
|
|
|
+#endif
|
|
|
ether_setup(dev);
|
|
|
|
|
|
spin_lock_init(&ei_local->page_lock);
|