Skip to content

Commit

Permalink
dlci: convert to net_device_ops
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Mar 22, 2009
1 parent 07d117c commit 49e8aba
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions drivers/net/wan/dlci.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev)

netif_stop_queue(dev);

ret = dlp->slave->hard_start_xmit(skb, dlp->slave);
ret = dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave);
switch (ret)
{
case DLCI_RET_OK:
Expand Down Expand Up @@ -295,11 +295,9 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

static int dlci_change_mtu(struct net_device *dev, int new_mtu)
{
struct dlci_local *dlp;

dlp = netdev_priv(dev);
struct dlci_local *dlp = netdev_priv(dev);

return((*dlp->slave->change_mtu)(dlp->slave, new_mtu));
return dev_set_mtu(dlp->slave, new_mtu);
}

static int dlci_open(struct net_device *dev)
Expand Down Expand Up @@ -479,17 +477,21 @@ static const struct header_ops dlci_header_ops = {
.create = dlci_header,
};

static const struct net_device_ops dlci_netdev_ops = {
.ndo_open = dlci_open,
.ndo_stop = dlci_close,
.ndo_do_ioctl = dlci_dev_ioctl,
.ndo_start_xmit = dlci_transmit,
.ndo_change_mtu = dlci_change_mtu,
};

static void dlci_setup(struct net_device *dev)
{
struct dlci_local *dlp = netdev_priv(dev);

dev->flags = 0;
dev->open = dlci_open;
dev->stop = dlci_close;
dev->do_ioctl = dlci_dev_ioctl;
dev->hard_start_xmit = dlci_transmit;
dev->header_ops = &dlci_header_ops;
dev->change_mtu = dlci_change_mtu;
dev->netdev_ops = &dlci_netdev_ops;
dev->destructor = free_netdev;

dlp->receive = dlci_receive;
Expand Down

0 comments on commit 49e8aba

Please sign in to comment.