lkml.org 
[lkml]   [2009]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/7] bfin_mac: fix build error due to net_device_ops convert
    Date
    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
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2009-05-26 11:19    [W:0.021 / U:7.664 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site