From: Scott Wood <scottwood@freescale.com>
To: jgarzik@pobox.com
Cc: netdev@vger.kernel.org
Subject: [PATCH 2/9] fs_enet: Fix build breakage.
Date: Mon, 1 Oct 2007 14:20:47 -0500 [thread overview]
Message-ID: <20071001192047.GA28429@loki.buserror.net> (raw)
In-Reply-To: <20071001192017.GA28410@loki.buserror.net>
Commit 4fa57c9ea9f36f9ca852f3a88ca5d2f1aebbc960
("Make NAPI polling independent of struct net_device objects.")
introduced some build breakage in the napi rx function.
Signed-off-by: Scott Wood <scottwood@freescale.com>
---
drivers/net/fs_enet/fs_enet-main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 2a1b150..a15345b 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -73,8 +73,8 @@ static void fs_set_multicast_list(struct net_device *dev)
/* NAPI receive function */
static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
{
- struct fs_enet_private *fep = container_of(napi, struct fec_enet_private, napi);
- struct net_device *dev = fep->dev;
+ struct fs_enet_private *fep = container_of(napi, struct fs_enet_private, napi);
+ struct net_device *dev = to_net_dev(fep->dev);
const struct fs_platform_info *fpi = fep->fpi;
cbd_t *bdp;
struct sk_buff *skb, *skbn, *skbt;
--
1.5.3.2
next prev parent reply other threads:[~2007-10-01 19:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-01 19:20 [PATCH 1/9] fs_enet: Whitespace cleanup Scott Wood
2007-10-01 19:20 ` Scott Wood [this message]
2007-10-01 19:20 ` [PATCH 3/9] fs_enet: Include linux/string.h from linux/fs_enet_pd.h Scott Wood
2007-10-01 19:20 ` [PATCH 4/9] fs_enet: mac-fcc: Eliminate __fcc-* macros Scott Wood
2007-10-01 19:20 ` [PATCH 5/9] fs_enet: Align receive buffers Scott Wood
2007-10-01 19:20 ` [PATCH 6/9] fs_enet: Be an of_platform device when CONFIG_PPC_CPM_NEW_BINDING is set Scott Wood
2007-10-01 19:20 ` [PATCH 7/9] Generic bitbanged MDIO library Scott Wood
2007-10-01 19:20 ` [PATCH 8/9] fs_enet: Convert mii-bitbang to use the generic bitbang MDIO code Scott Wood
2007-10-01 19:20 ` [PATCH 9/9] fs_enet: sparse fixes Scott Wood
2007-10-02 15:55 ` [PATCH v2 6/9] fs_enet: Be an of_platform device when CONFIG_PPC_CPM_NEW_BINDING is set Scott Wood
2007-10-02 17:31 ` [PATCH 1/9] fs_enet: Whitespace cleanup Jeff Garzik
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=20071001192047.GA28429@loki.buserror.net \
--to=scottwood@freescale.com \
--cc=jgarzik@pobox.com \
--cc=netdev@vger.kernel.org \
/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).