* [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert
@ 2009-05-26 9:29 Mike Frysinger
2009-05-26 9:29 ` David Miller
2009-05-27 3:55 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Mike Frysinger @ 2009-05-26 9:29 UTC (permalink / raw
To: netdev; +Cc: uclinux-dist-devel, Alexander Beregalov, David S. Miller
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert
2009-05-26 9:29 [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert Mike Frysinger
@ 2009-05-26 9:29 ` David Miller
2009-05-26 23:14 ` [Uclinux-dist-devel] " Mike Frysinger
2009-05-27 3:55 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: David Miller @ 2009-05-26 9:29 UTC (permalink / raw
To: vapier; +Cc: netdev, uclinux-dist-devel, a.beregalov
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 26 May 2009 05:29:09 -0400
> 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>
I'll queue this up, thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Uclinux-dist-devel] [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert
2009-05-26 9:29 ` David Miller
@ 2009-05-26 23:14 ` Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2009-05-26 23:14 UTC (permalink / raw
To: David Miller; +Cc: netdev, a.beregalov, uclinux-dist-devel
On Tue, May 26, 2009 at 05:29, David Miller wrote:
> From: Mike Frysinger <vapier@gentoo.org>
> Date: Tue, 26 May 2009 05:29:09 -0400
>
>> 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>
>
> I'll queue this up, thank you.
for 2.6.30 right ? :) this is a fix for an error introduced during
the 2.6.30 merge window ...
-mike
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert
2009-05-26 9:29 [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert Mike Frysinger
2009-05-26 9:29 ` David Miller
@ 2009-05-27 3:55 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2009-05-27 3:55 UTC (permalink / raw
To: vapier; +Cc: netdev, uclinux-dist-devel, a.beregalov
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 26 May 2009 05:29:09 -0400
> 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>
Applied, thanks Mike.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 0/7] Blackfin fixes for 2.6.30
@ 2009-05-26 9:15 Mike Frysinger
2009-05-26 9:15 ` [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert Mike Frysinger
0 siblings, 1 reply; 5+ messages in thread
From: Mike Frysinger @ 2009-05-26 9:15 UTC (permalink / raw
To: linux-kernel; +Cc: uclinux-dist-devel
Sorry for being so late, but our previous Blackfin maintainer has moved
on, so we've been working at picking up the slack.
So the stuff here for 2.6.30 is just simple build fixes, gitignore tweaks,
MAINTAINER updates, and hooking up the new pread syscalls (which was posted
a while ago already).
Mike Frysinger (7):
bfin_mac: fix build error due to net_device_ops convert
Blackfin: hook up preadv/pwritev syscalls
MAINTAINERS: update Blackfin items
MAINTAINERS: drop (subscribers-only) markings on Blackfin lists
Blackfin: ignore generated vmlinux.lds
Blackfin: drop unneeded asm/.gitignore
Blackfin: fix strncmp.o build error
MAINTAINERS | 18 +++++++++---------
arch/blackfin/include/asm/.gitignore | 1 -
arch/blackfin/include/asm/unistd.h | 4 +++-
arch/blackfin/kernel/.gitignore | 1 +
arch/blackfin/lib/strncmp.c | 3 +--
arch/blackfin/mach-common/entry.S | 2 ++
drivers/net/bfin_mac.c | 29 ++++++++++++++---------------
7 files changed, 30 insertions(+), 28 deletions(-)
delete mode 100644 arch/blackfin/include/asm/.gitignore
create mode 100644 arch/blackfin/kernel/.gitignore
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert
2009-05-26 9:15 [PATCH 0/7] Blackfin fixes for 2.6.30 Mike Frysinger
@ 2009-05-26 9:15 ` Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2009-05-26 9:15 UTC (permalink / raw
To: linux-kernel; +Cc: uclinux-dist-devel, Alexander Beregalov, David S. Miller
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-05-27 3:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-26 9:29 [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert Mike Frysinger
2009-05-26 9:29 ` David Miller
2009-05-26 23:14 ` [Uclinux-dist-devel] " Mike Frysinger
2009-05-27 3:55 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2009-05-26 9:15 [PATCH 0/7] Blackfin fixes for 2.6.30 Mike Frysinger
2009-05-26 9:15 ` [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert Mike Frysinger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.