diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-05-26 23:55:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-26 23:55:33 -0400 |
| commit | b63dc8fef7ca5c51d163295d824e78c770d48ccf (patch) | |
| tree | d9cc6511e45fbeb74da1a796731615ccb9032f97 | |
| parent | 5ad18900355743757e7f415bcb850ea8406a13e2 (diff) | |
bfin_mac: fix build error due to net_device_ops convert
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | 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 9f971ed6b58d..b4da18213324 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) | |||
| 979 | return 0; | 979 | return 0; |
| 980 | } | 980 | } |
| 981 | 981 | ||
| 982 | static const struct net_device_ops bfin_mac_netdev_ops = { | ||
| 983 | .ndo_open = bfin_mac_open, | ||
| 984 | .ndo_stop = bfin_mac_close, | ||
| 985 | .ndo_start_xmit = bfin_mac_hard_start_xmit, | ||
| 986 | .ndo_set_mac_address = bfin_mac_set_mac_address, | ||
| 987 | .ndo_tx_timeout = bfin_mac_timeout, | ||
| 988 | .ndo_set_multicast_list = bfin_mac_set_multicast_list, | ||
| 989 | .ndo_validate_addr = eth_validate_addr, | ||
| 990 | .ndo_change_mtu = eth_change_mtu, | ||
| 991 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
| 992 | .ndo_poll_controller = bfin_mac_poll, | ||
| 993 | #endif | ||
| 994 | }; | ||
| 995 | |||
| 996 | /* | 982 | /* |
| 997 | * | ||
| 998 | * this makes the board clean up everything that it can | 983 | * this makes the board clean up everything that it can |
| 999 | * and not talk to the outside world. Caused by | 984 | * and not talk to the outside world. Caused by |
| 1000 | * an 'ifconfig ethX down' | 985 | * an 'ifconfig ethX down' |
| @@ -1019,6 +1004,20 @@ static int bfin_mac_close(struct net_device *dev) | |||
| 1019 | return 0; | 1004 | return 0; |
| 1020 | } | 1005 | } |
| 1021 | 1006 | ||
| 1007 | static const struct net_device_ops bfin_mac_netdev_ops = { | ||
| 1008 | .ndo_open = bfin_mac_open, | ||
| 1009 | .ndo_stop = bfin_mac_close, | ||
| 1010 | .ndo_start_xmit = bfin_mac_hard_start_xmit, | ||
| 1011 | .ndo_set_mac_address = bfin_mac_set_mac_address, | ||
| 1012 | .ndo_tx_timeout = bfin_mac_timeout, | ||
| 1013 | .ndo_set_multicast_list = bfin_mac_set_multicast_list, | ||
| 1014 | .ndo_validate_addr = eth_validate_addr, | ||
| 1015 | .ndo_change_mtu = eth_change_mtu, | ||
| 1016 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
| 1017 | .ndo_poll_controller = bfin_mac_poll, | ||
| 1018 | #endif | ||
| 1019 | }; | ||
| 1020 | |||
| 1022 | static int __devinit bfin_mac_probe(struct platform_device *pdev) | 1021 | static int __devinit bfin_mac_probe(struct platform_device *pdev) |
| 1023 | { | 1022 | { |
| 1024 | struct net_device *ndev; | 1023 | struct net_device *ndev; |
