From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org, shemminger@vyatta.com
Subject: Re: linux-next: net tree build failure
Date: Sun, 23 Nov 2008 20:03:03 -0800 (PST) [thread overview]
Message-ID: <20081123.200303.133339984.davem@davemloft.net> (raw)
In-Reply-To: <20081123.195602.16120267.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Sun, 23 Nov 2008 19:56:02 -0800 (PST)
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 24 Nov 2008 13:43:01 +1100
>
> > Caused by commit 4e4fd4e485ad63a9074ff09a9b53ffc7a5c594ec ("ne2k: convert
> > to net_device_ops").
> >
> > I have dropped the net tree again.
>
> Can't you just revert the patch to fix the build instead? :-/
Or wait the 5 friggin' minutes it took me to compose and
push out this obvious patch. It's not like we're not awake
at the same time :-/
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>
---
drivers/net/pcmcia/axnet_cs.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 2aca8df..c9890b4 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -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;
--
1.5.6.5
next prev parent reply other threads:[~2008-11-24 4:03 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-24 2:43 linux-next: net tree build failure Stephen Rothwell
2008-11-24 3:56 ` David Miller
2008-11-24 4:03 ` David Miller [this message]
2008-11-24 4:25 ` Stephen Rothwell
2008-11-24 4:28 ` David Miller
2008-11-24 4:49 ` Stephen Rothwell
2008-11-24 5:04 ` David Miller
2008-11-24 5:20 ` Stephen Rothwell
2008-11-24 5:22 ` Stephen Rothwell
2008-11-24 5:23 ` David Miller
2008-11-24 5:29 ` David Miller
2008-11-24 5:45 ` Stephen Rothwell
2008-11-24 5:38 ` Stephen Rothwell
2008-11-24 21:00 ` Sam Ravnborg
2008-11-24 21:52 ` Stephen Hemminger
2008-11-24 22:12 ` Sam Ravnborg
2008-11-25 8:42 ` Stephen Rothwell
2008-11-25 9:01 ` Sam Ravnborg
-- strict thread matches above, loose matches on Subject: below --
2010-01-27 2:18 Stephen Rothwell
2010-01-27 4:49 ` David Miller
2010-01-11 7:42 Stephen Rothwell
2010-01-11 8:02 ` David Miller
2010-01-11 8:16 ` Joe Perches
2010-01-11 8:44 ` David Miller
2010-01-11 8:49 ` Stephen Rothwell
2010-01-11 11:16 ` Maciej W. Rozycki
2009-11-18 5:51 Stephen Rothwell
2009-11-18 7:05 ` David Miller
2009-11-19 10:51 ` Shreyas Bhatewara
2009-11-14 6:50 Stephen Rothwell
2009-11-14 13:18 ` Arnaldo Carvalho de Melo
2009-11-09 2:21 Stephen Rothwell
2009-11-09 4:41 ` David Miller
2009-10-13 4:33 Stephen Rothwell
2009-10-13 5:14 ` Michael Chan
2009-10-13 6:20 ` David Miller
2009-10-13 6:19 ` David Miller
2009-06-17 6:31 Stephen Rothwell
2009-06-17 8:36 ` David Miller
2009-06-17 13:10 ` Stephen Rothwell
[not found] <20090521001928.4bf71911.sfr@canb.auug.org.au>
2009-05-20 14:53 ` Eric W. Biederman
2009-05-20 19:44 ` David Miller
2009-04-24 7:01 Stephen Rothwell
2009-04-24 11:53 ` David Miller
2009-04-24 11:57 ` Stephen Rothwell
2009-04-22 0:29 Stephen Rothwell
2009-04-22 0:37 ` Alexander Beregalov
2009-04-22 1:12 ` David Miller
2009-04-20 1:26 Stephen Rothwell
2009-04-20 1:36 ` Alexander Beregalov
2009-04-20 1:43 ` David Miller
2009-04-20 1:50 ` Stephen Rothwell
2009-03-19 4:46 Stephen Rothwell
2009-03-19 5:40 ` David Miller
2009-04-01 19:58 ` Ingo Molnar
2009-04-01 21:22 ` David Miller
2009-03-30 1:15 ` Stephen Rothwell
2009-03-30 1:50 ` Stephen Rothwell
2009-03-02 7:05 Stephen Rothwell
2009-03-02 9:49 ` David Miller
2009-03-02 16:38 ` Andy Grover
2009-03-03 1:55 ` Stephen Rothwell
2009-03-03 3:22 ` Andy Grover
2009-01-26 2:53 Stephen Rothwell
2009-01-26 4:46 ` David Miller
2009-01-26 5:15 ` Stephen Rothwell
2009-01-26 5:17 ` David Miller
2009-01-26 8:31 ` Stephen Rothwell
2009-01-26 19:40 ` David Miller
2009-01-23 7:28 Stephen Rothwell
2009-01-23 7:56 ` David Miller
2009-01-23 8:01 ` Stephen Rothwell
2009-01-23 8:13 ` David Miller
2009-01-23 10:21 ` Stephen Rothwell
2009-01-23 10:39 ` Stephen Rothwell
2009-01-23 10:50 ` Stephen Rothwell
2009-01-24 6:27 ` David Miller
2008-12-09 6:29 Stephen Rothwell
2008-12-09 8:04 ` David Miller
2008-12-09 8:54 ` Stephen Rothwell
2008-12-09 9:05 ` David Miller
2008-12-09 9:12 ` Marcel Holtmann
2008-11-28 3:46 Stephen Rothwell
2008-11-28 7:07 ` David Miller
2008-11-26 7:15 Stephen Rothwell
2008-11-26 7:51 ` Herbert Xu
2008-11-26 8:45 ` David Miller
2008-11-26 9:40 ` Stephen Rothwell
2008-11-21 2:44 Stephen Rothwell
2008-11-21 4:02 ` Stephen Hemminger
2008-11-21 4:13 ` David Miller
2008-11-20 2:58 Stephen Rothwell
2008-11-20 2:30 Stephen Rothwell
2008-12-29 6:45 ` Stephen Rothwell
2008-09-13 5:03 Stephen Rothwell
2008-09-13 6:24 ` David Miller
2008-09-13 9:42 ` Stephen Rothwell
2008-09-15 0:54 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081123.200303.133339984.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).