| Message ID | 20090409144652.GA4012@orion |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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); > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html