Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 666c1d98cdaf1d695aece39e195eac212d42e264..d7b81e4fdd5631c0c537cd971cad3bebb72bb38d 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -213,7 +213,7 @@ static int check_filter(struct tap_filter *filter, const struct sk_buff *skb)
 
 /* Network device part of the driver */
 
-static unsigned int tun_net_id;
+static int tun_net_id;
 struct tun_net {
        struct list_head dev_list;
 };
@@ -343,7 +343,7 @@ static void tun_net_init(struct net_device *dev)
                break;
 
        case TUN_TAP_DEV:
-               dev->netdev_ops = &tun_netdev_ops;
+               dev->netdev_ops = &tap_netdev_ops;
                /* Ethernet TAP Device */
                ether_setup(dev);