| Message ID | 20090321053713.225888375@vyatta.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Stephen Hemminger <shemminger@vyatta.com> Date: Fri, 20 Mar 2009 22:35:36 -0700 > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Applied. -- 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
On Fri, Mar 20, 2009 at 10:35:36PM -0700, Stephen Hemminger wrote: > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Samuel Ortiz <samuel@sortiz.org> > > --- > drivers/net/irda/mcs7780.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > --- a/drivers/net/irda/mcs7780.c 2009-03-19 22:40:30.408964174 -0700 > +++ b/drivers/net/irda/mcs7780.c 2009-03-19 22:42:47.157714010 -0700 > @@ -873,6 +873,13 @@ static int mcs_hard_xmit(struct sk_buff > return ret; > } > > +static const struct net_device_ops mcs_netdev_ops = { > + .ndo_open = mcs_net_open, > + .ndo_stop = mcs_net_close, > + .ndo_start_xmit = mcs_hard_xmit, > + .ndo_do_ioctl = mcs_net_ioctl, > +}; > + > /* > * This function is called by the USB subsystem for each new device in the > * system. Need to verify the device and if it is, then start handling it. > @@ -919,11 +926,7 @@ static int mcs_probe(struct usb_interfac > /* Speed change work initialisation*/ > INIT_WORK(&mcs->work, mcs_speed_work); > > - /* Override the network functions we need to use */ > - ndev->hard_start_xmit = mcs_hard_xmit; > - ndev->open = mcs_net_open; > - ndev->stop = mcs_net_close; > - ndev->do_ioctl = mcs_net_ioctl; > + ndev->netdev_ops = &mcs_netdev_ops; > > if (!intf->cur_altsetting) > goto error2; > > --
--- a/drivers/net/irda/mcs7780.c 2009-03-19 22:40:30.408964174 -0700 +++ b/drivers/net/irda/mcs7780.c 2009-03-19 22:42:47.157714010 -0700 @@ -873,6 +873,13 @@ static int mcs_hard_xmit(struct sk_buff return ret; } +static const struct net_device_ops mcs_netdev_ops = { + .ndo_open = mcs_net_open, + .ndo_stop = mcs_net_close, + .ndo_start_xmit = mcs_hard_xmit, + .ndo_do_ioctl = mcs_net_ioctl, +}; + /* * This function is called by the USB subsystem for each new device in the * system. Need to verify the device and if it is, then start handling it. @@ -919,11 +926,7 @@ static int mcs_probe(struct usb_interfac /* Speed change work initialisation*/ INIT_WORK(&mcs->work, mcs_speed_work); - /* Override the network functions we need to use */ - ndev->hard_start_xmit = mcs_hard_xmit; - ndev->open = mcs_net_open; - ndev->stop = mcs_net_close; - ndev->do_ioctl = mcs_net_ioctl; + ndev->netdev_ops = &mcs_netdev_ops; if (!intf->cur_altsetting) goto error2;
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> --- drivers/net/irda/mcs7780.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)