[PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert

[PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert

[Mike Frysinger]

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

Re: [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert

[David Miller]

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.

Re: [Uclinux-dist-devel] [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert

[Mike Frysinger]

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

Re: [PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert

[David Miller]

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.