* [PATCH] fs_enet: convert to netdev_ops
@ 2009-04-09 14:46 Alexander Beregalov
2009-04-09 14:49 ` Subrata Modak
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Beregalov @ 2009-04-09 14:46 UTC (permalink / raw)
To: netdev, David Miller, linux-next, Subrata Modak, Linuxppc-dev
Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com>
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
drivers/net/fs_enet/fs_enet-main.c | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index b037ce9..a9cbc31 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1019,6 +1019,22 @@ out_put_phy:
#define IS_FEC(match) 0
#endif
+static const struct net_device_ops fs_enet_netdev_ops = {
+ .ndo_open = fs_enet_open,
+ .ndo_stop = fs_enet_close,
+ .ndo_get_stats = fs_enet_get_stats,
+ .ndo_start_xmit = fs_enet_start_xmit,
+ .ndo_tx_timeout = fs_timeout,
+ .ndo_set_multicast_list = fs_set_multicast_list,
+ .ndo_do_ioctl = fs_ioctl,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_change_mtu = eth_change_mtu,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ .ndo_poll_controller = fs_enet_netpoll,
+#endif
+};
+
static int __devinit fs_enet_probe(struct of_device *ofdev,
const struct of_device_id *match)
{
@@ -1093,22 +1109,13 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
fep->tx_ring = fpi->tx_ring;
fep->rx_ring = fpi->rx_ring;
- ndev->open = fs_enet_open;
- ndev->hard_start_xmit = fs_enet_start_xmit;
- ndev->tx_timeout = fs_timeout;
+ ndev->netdev_ops = &fs_enet_netdev_ops;
ndev->watchdog_timeo = 2 * HZ;
- ndev->stop = fs_enet_close;
- ndev->get_stats = fs_enet_get_stats;
- ndev->set_multicast_list = fs_set_multicast_list;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- ndev->poll_controller = fs_enet_netpoll;
-#endif
if (fpi->use_napi)
netif_napi_add(ndev, &fep->napi, fs_enet_rx_napi,
fpi->napi_weight);
ndev->ethtool_ops = &fs_ethtool_ops;
- ndev->do_ioctl = fs_ioctl;
init_timer(&fep->phy_timer_list);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] fs_enet: convert to netdev_ops
2009-04-09 14:46 [PATCH] fs_enet: convert to netdev_ops Alexander Beregalov
@ 2009-04-09 14:49 ` Subrata Modak
2009-04-11 9:44 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Subrata Modak @ 2009-04-09 14:49 UTC (permalink / raw)
To: Alexander Beregalov
Cc: netdev, David Miller, linux-next, Linuxppc-dev, sachinp
On Thu, 2009-04-09 at 18:46 +0400, Alexander Beregalov wrote:
> Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com>
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Thanks. Adding Sachin in Cc:
Regards--
Subrata
> ---
>
>
> drivers/net/fs_enet/fs_enet-main.c | 27 +++++++++++++++++----------
> 1 files changed, 17 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
> index b037ce9..a9cbc31 100644
> --- a/drivers/net/fs_enet/fs_enet-main.c
> +++ b/drivers/net/fs_enet/fs_enet-main.c
> @@ -1019,6 +1019,22 @@ out_put_phy:
> #define IS_FEC(match) 0
> #endif
>
> +static const struct net_device_ops fs_enet_netdev_ops = {
> + .ndo_open = fs_enet_open,
> + .ndo_stop = fs_enet_close,
> + .ndo_get_stats = fs_enet_get_stats,
> + .ndo_start_xmit = fs_enet_start_xmit,
> + .ndo_tx_timeout = fs_timeout,
> + .ndo_set_multicast_list = fs_set_multicast_list,
> + .ndo_do_ioctl = fs_ioctl,
> + .ndo_validate_addr = eth_validate_addr,
> + .ndo_set_mac_address = eth_mac_addr,
> + .ndo_change_mtu = eth_change_mtu,
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> + .ndo_poll_controller = fs_enet_netpoll,
> +#endif
> +};
> +
> static int __devinit fs_enet_probe(struct of_device *ofdev,
> const struct of_device_id *match)
> {
> @@ -1093,22 +1109,13 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
> fep->tx_ring = fpi->tx_ring;
> fep->rx_ring = fpi->rx_ring;
>
> - ndev->open = fs_enet_open;
> - ndev->hard_start_xmit = fs_enet_start_xmit;
> - ndev->tx_timeout = fs_timeout;
> + ndev->netdev_ops = &fs_enet_netdev_ops;
> ndev->watchdog_timeo = 2 * HZ;
> - ndev->stop = fs_enet_close;
> - ndev->get_stats = fs_enet_get_stats;
> - ndev->set_multicast_list = fs_set_multicast_list;
> -#ifdef CONFIG_NET_POLL_CONTROLLER
> - ndev->poll_controller = fs_enet_netpoll;
> -#endif
> if (fpi->use_napi)
> netif_napi_add(ndev, &fep->napi, fs_enet_rx_napi,
> fpi->napi_weight);
>
> ndev->ethtool_ops = &fs_ethtool_ops;
> - ndev->do_ioctl = fs_ioctl;
>
> init_timer(&fep->phy_timer_list);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fs_enet: convert to netdev_ops
2009-04-09 14:49 ` Subrata Modak
@ 2009-04-11 9:44 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-04-11 9:44 UTC (permalink / raw)
To: subrata; +Cc: a.beregalov, netdev, linux-next, Linuxppc-dev, sachinp
From: Subrata Modak <subrata@linux.vnet.ibm.com>
Date: Thu, 09 Apr 2009 20:19:48 +0530
> On Thu, 2009-04-09 at 18:46 +0400, Alexander Beregalov wrote:
>> Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com>
>> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
>
> Thanks. Adding Sachin in Cc:
I've applied this patch.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-11 9:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-09 14:46 [PATCH] fs_enet: convert to netdev_ops Alexander Beregalov
2009-04-09 14:49 ` Subrata Modak
2009-04-11 9:44 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).