| Submitter | David Miller |
|---|---|
| Date | March 20, 2009, 7:52 a.m. |
| Message ID | <20090320.005205.65922171.davem@davemloft.net> |
| Download | mbox | patch |
| Permalink | /patch/24725/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
David Miller wrote: > Committed to net-next-2.6... > > sunvnet: Convert to net_device_ops. I noticed that there are other drivers's net_device_ops need to be converted,is these convert nessary? > > Signed-off-by: David S. Miller <davem@davemloft.net> > --- > drivers/net/sunvnet.c | 18 +++++++++++------- > 1 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c > index 611230f..a82fb2a 100644 > --- a/drivers/net/sunvnet.c > +++ b/drivers/net/sunvnet.c > @@ -1012,6 +1012,16 @@ err_out: > static LIST_HEAD(vnet_list); > static DEFINE_MUTEX(vnet_list_mutex); > > +static const struct net_device_ops vnet_ops = { > + .ndo_open = vnet_open, > + .ndo_stop = vnet_close, > + .ndo_set_multicast_list = vnet_set_rx_mode, > + .ndo_set_mac_address = vnet_set_mac_addr, > + .ndo_tx_timeout = vnet_tx_timeout, > + .ndo_change_mtu = vnet_change_mtu, > + .ndo_start_xmit = vnet_start_xmit, > +}; > + > static struct vnet * __devinit vnet_new(const u64 *local_mac) > { > struct net_device *dev; > @@ -1040,15 +1050,9 @@ static struct vnet * __devinit vnet_new(const u64 *local_mac) > INIT_LIST_HEAD(&vp->list); > vp->local_mac = *local_mac; > > - dev->open = vnet_open; > - dev->stop = vnet_close; > - dev->set_multicast_list = vnet_set_rx_mode; > - dev->set_mac_address = vnet_set_mac_addr; > - dev->tx_timeout = vnet_tx_timeout; > + dev->netdev_ops = &vnet_ops; > dev->ethtool_ops = &vnet_ethtool_ops; > dev->watchdog_timeo = VNET_TX_TIMEOUT; > - dev->change_mtu = vnet_change_mtu; > - dev->hard_start_xmit = vnet_start_xmit; > > err = register_netdev(dev); > if (err) {
From: Yang Hongyang <yanghy@cn.fujitsu.com> Date: Fri, 20 Mar 2009 16:30:59 +0800 > David Miller wrote: > > Committed to net-next-2.6... > > > > sunvnet: Convert to net_device_ops. > > I noticed that there are other drivers's net_device_ops > need to be converted,is these convert nessary? Not necessary, but desirable. Once all drivers are converted we can remove the compatability code. -- 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
Patch
diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c index 611230f..a82fb2a 100644 --- a/drivers/net/sunvnet.c +++ b/drivers/net/sunvnet.c @@ -1012,6 +1012,16 @@ err_out: static LIST_HEAD(vnet_list); static DEFINE_MUTEX(vnet_list_mutex); +static const struct net_device_ops vnet_ops = { + .ndo_open = vnet_open, + .ndo_stop = vnet_close, + .ndo_set_multicast_list = vnet_set_rx_mode, + .ndo_set_mac_address = vnet_set_mac_addr, + .ndo_tx_timeout = vnet_tx_timeout, + .ndo_change_mtu = vnet_change_mtu, + .ndo_start_xmit = vnet_start_xmit, +}; + static struct vnet * __devinit vnet_new(const u64 *local_mac) { struct net_device *dev; @@ -1040,15 +1050,9 @@ static struct vnet * __devinit vnet_new(const u64 *local_mac) INIT_LIST_HEAD(&vp->list); vp->local_mac = *local_mac; - dev->open = vnet_open; - dev->stop = vnet_close; - dev->set_multicast_list = vnet_set_rx_mode; - dev->set_mac_address = vnet_set_mac_addr; - dev->tx_timeout = vnet_tx_timeout; + dev->netdev_ops = &vnet_ops; dev->ethtool_ops = &vnet_ethtool_ops; dev->watchdog_timeo = VNET_TX_TIMEOUT; - dev->change_mtu = vnet_change_mtu; - dev->hard_start_xmit = vnet_start_xmit; err = register_netdev(dev); if (err) {
Committed to net-next-2.6... sunvnet: Convert to net_device_ops. Signed-off-by: David S. Miller <davem@davemloft.net> --- drivers/net/sunvnet.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-)