From: Mike Frysinger <vapier@gentoo.org>
To: linux-kernel@vger.kernel.org
Cc: uclinux-dist-devel@blackfin.uclinux.org,
Alexander Beregalov <a.beregalov@gmail.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert
Date: Tue, 26 May 2009 05:15:50 -0400 [thread overview]
Message-ID: <1243329356-12644-2-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1243329356-12644-1-git-send-email-vapier@gentoo.org>
The previous commit "convert to net_device_ops" broke the Blackfin MAC
driver as it declared the new structure before the function it used:
CC drivers/net/bfin_mac.o
drivers/net/bfin_mac.c:984: error: ‘bfin_mac_close’ undeclared here (not in a function)
make[1]: *** [drivers/net/bfin_mac.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Alexander Beregalov <a.beregalov@gmail.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/bfin_mac.c | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 9f971ed..b4da182 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -979,22 +979,7 @@ static int bfin_mac_open(struct net_device *dev)
return 0;
}
-static const struct net_device_ops bfin_mac_netdev_ops = {
- .ndo_open = bfin_mac_open,
- .ndo_stop = bfin_mac_close,
- .ndo_start_xmit = bfin_mac_hard_start_xmit,
- .ndo_set_mac_address = bfin_mac_set_mac_address,
- .ndo_tx_timeout = bfin_mac_timeout,
- .ndo_set_multicast_list = bfin_mac_set_multicast_list,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_change_mtu = eth_change_mtu,
-#ifdef CONFIG_NET_POLL_CONTROLLER
- .ndo_poll_controller = bfin_mac_poll,
-#endif
-};
-
/*
- *
* this makes the board clean up everything that it can
* and not talk to the outside world. Caused by
* an 'ifconfig ethX down'
@@ -1019,6 +1004,20 @@ static int bfin_mac_close(struct net_device *dev)
return 0;
}
+static const struct net_device_ops bfin_mac_netdev_ops = {
+ .ndo_open = bfin_mac_open,
+ .ndo_stop = bfin_mac_close,
+ .ndo_start_xmit = bfin_mac_hard_start_xmit,
+ .ndo_set_mac_address = bfin_mac_set_mac_address,
+ .ndo_tx_timeout = bfin_mac_timeout,
+ .ndo_set_multicast_list = bfin_mac_set_multicast_list,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_change_mtu = eth_change_mtu,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ .ndo_poll_controller = bfin_mac_poll,
+#endif
+};
+
static int __devinit bfin_mac_probe(struct platform_device *pdev)
{
struct net_device *ndev;
--
1.6.3.1
next prev parent reply other threads:[~2009-05-26 9:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-26 9:15 [PATCH 0/7] Blackfin fixes for 2.6.30 Mike Frysinger
2009-05-26 9:15 ` Mike Frysinger [this message]
2009-05-26 9:15 ` [PATCH 2/7] Blackfin: hook up preadv/pwritev syscalls Mike Frysinger
2009-05-26 9:15 ` [PATCH 3/7] MAINTAINERS: update Blackfin items Mike Frysinger
2009-05-26 9:15 ` [PATCH 4/7] MAINTAINERS: drop (subscribers-only) markings on Blackfin lists Mike Frysinger
2009-05-26 9:15 ` [PATCH 5/7] Blackfin: ignore generated vmlinux.lds Mike Frysinger
2009-05-26 9:15 ` [PATCH 6/7] Blackfin: drop unneeded asm/.gitignore Mike Frysinger
2009-05-26 9:15 ` [PATCH 7/7] Blackfin: fix strncmp.o build error Mike Frysinger
2009-05-26 9:26 ` [PATCH 0/7] Blackfin fixes for 2.6.30 David Miller
2009-05-26 9:28 ` David Miller
2009-05-26 9:30 ` Mike Frysinger
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=1243329356-12644-2-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=a.beregalov@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=uclinux-dist-devel@blackfin.uclinux.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
all inboxes | Powered by JetHome®