| Message ID | 20090321053713.973495714@vyatta.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Stephen Hemminger <shemminger@vyatta.com> Date: Fri, 20 Mar 2009 22:35:46 -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:46PM -0700, Stephen Hemminger wrote: > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Samuel Ortiz <samuel@sortiz.org> > > --- a/drivers/net/irda/ksdazzle-sir.c 2009-03-19 22:52:37.149901612 -0700 > +++ b/drivers/net/irda/ksdazzle-sir.c 2009-03-19 23:08:49.416839813 -0700 > @@ -562,6 +562,13 @@ static int ksdazzle_net_ioctl(struct net > return ret; > } > > +static const struct net_device_ops ksdazzle_ops = { > + .ndo_start_xmit = ksdazzle_hard_xmit, > + .ndo_open = ksdazzle_net_open, > + .ndo_stop = ksdazzle_net_close, > + .ndo_do_ioctl = ksdazzle_net_ioctl, > +}; > + > /* > * This routine is called by the USB subsystem for each new device > * in the system. We need to check if the device is ours, and in > @@ -684,10 +691,7 @@ static int ksdazzle_probe(struct usb_int > irda_qos_bits_to_value(&kingsun->qos); > > /* Override the network functions we need to use */ > - net->hard_start_xmit = ksdazzle_hard_xmit; > - net->open = ksdazzle_net_open; > - net->stop = ksdazzle_net_close; > - net->do_ioctl = ksdazzle_net_ioctl; > + net->netdev_ops = &ksdazzle_ops; > > ret = register_netdev(net); > if (ret != 0) > > --
--- a/drivers/net/irda/ksdazzle-sir.c 2009-03-19 22:52:37.149901612 -0700 +++ b/drivers/net/irda/ksdazzle-sir.c 2009-03-19 23:08:49.416839813 -0700 @@ -562,6 +562,13 @@ static int ksdazzle_net_ioctl(struct net return ret; } +static const struct net_device_ops ksdazzle_ops = { + .ndo_start_xmit = ksdazzle_hard_xmit, + .ndo_open = ksdazzle_net_open, + .ndo_stop = ksdazzle_net_close, + .ndo_do_ioctl = ksdazzle_net_ioctl, +}; + /* * This routine is called by the USB subsystem for each new device * in the system. We need to check if the device is ours, and in @@ -684,10 +691,7 @@ static int ksdazzle_probe(struct usb_int irda_qos_bits_to_value(&kingsun->qos); /* Override the network functions we need to use */ - net->hard_start_xmit = ksdazzle_hard_xmit; - net->open = ksdazzle_net_open; - net->stop = ksdazzle_net_close; - net->do_ioctl = ksdazzle_net_ioctl; + net->netdev_ops = &ksdazzle_ops; ret = register_netdev(net); if (ret != 0)
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>