Skip to content

Commit

Permalink
tun: convert to net_device_ops
Browse files Browse the repository at this point in the history
Convert the TUN/TAP tunnel driver to net_device_ops.
Split the ops in two, and retain compatability.

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 Nov 20, 2008
1 parent 48dfcde commit 758e43b
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,18 +305,35 @@ tun_net_change_mtu(struct net_device *dev, int new_mtu)
return 0;
}

static const struct net_device_ops tun_netdev_ops = {
.ndo_open = tun_net_open,
.ndo_stop = tun_net_close,
.ndo_change_mtu = tun_net_change_mtu,

};

static const struct net_device_ops tap_netdev_ops = {
.ndo_open = tun_net_open,
.ndo_stop = tun_net_close,
.ndo_change_mtu = tun_net_change_mtu,
.ndo_set_multicast_list = tun_net_mclist,
.ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
};

/* Initialize net device. */
static void tun_net_init(struct net_device *dev)
{
struct tun_struct *tun = netdev_priv(dev);

switch (tun->flags & TUN_TYPE_MASK) {
case TUN_TUN_DEV:
dev->netdev_ops = &tun_netdev_ops;

/* Point-to-Point TUN Device */
dev->hard_header_len = 0;
dev->addr_len = 0;
dev->mtu = 1500;
dev->change_mtu = tun_net_change_mtu;

/* Zero header length */
dev->type = ARPHRD_NONE;
Expand All @@ -325,10 +342,9 @@ static void tun_net_init(struct net_device *dev)
break;

case TUN_TAP_DEV:
dev->netdev_ops = &tun_netdev_ops;
/* Ethernet TAP Device */
ether_setup(dev);
dev->change_mtu = tun_net_change_mtu;
dev->set_multicast_list = tun_net_mclist;

random_ether_addr(dev->dev_addr);

Expand Down Expand Up @@ -675,9 +691,7 @@ static void tun_setup(struct net_device *dev)
tun->owner = -1;
tun->group = -1;

dev->open = tun_net_open;
dev->hard_start_xmit = tun_net_xmit;
dev->stop = tun_net_close;
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = free_netdev;
dev->features |= NETIF_F_NETNS_LOCAL;
Expand Down Expand Up @@ -749,6 +763,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
return -ENOMEM;

dev_net_set(dev, net);

tun = netdev_priv(dev);
tun->dev = dev;
tun->flags = flags;
Expand Down

0 comments on commit 758e43b

Please sign in to comment.