Cset exclude: davem@nuts.davemloft.net|ChangeSet|20040212080313|45938

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 2ec2c7ffb9deba9f8117036cd043be752aad3115..e33f1cd2812b27f289004b4e3b63bdac89ea8014 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -276,7 +276,6 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int
          return NULL;
 
        dev->init = ipgre_tunnel_init;
-       dev->tx_queue_len = 1;
        nt = dev->priv;
        nt->parms = *parms;
 
@@ -1270,7 +1269,6 @@ int __init ipgre_init(void)
        }
 
        ipgre_fb_tunnel_dev->init = ipgre_fb_tunnel_init;
-       ipgre_fb_tunnel_dev->tx_queue_len = 1;
 
        if ((err = register_netdev(ipgre_fb_tunnel_dev)))
                goto fail;

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index d2553fd3855666633ae5798eaacb9fcb4999ebd4..0b7e4b21bdfe5935ddd865c26b57f5c906148976 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -246,7 +246,6 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c
        nt = dev->priv;
        SET_MODULE_OWNER(dev);
        dev->init = ipip_tunnel_init;
-       dev->tx_queue_len = 1;
        dev->destructor = free_netdev;
        nt->parms = *parms;
 
@@ -893,7 +892,6 @@ int __init ipip_init(void)
        }
 
        ipip_fb_tunnel_dev->init = ipip_fb_tunnel_init;
-       ipip_fb_tunnel_dev->tx_queue_len = 1;
 
        if ((err = register_netdev(ipip_fb_tunnel_dev)))
            goto fail;

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 58598d6d3e09aa9184bd83175d872c21bbfe288a..13c993e164ab9006e7ae2ba7235ed120ac36cbbd 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -184,7 +184,6 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int
 
        nt = dev->priv;
        dev->init = ipip6_tunnel_init;
-       dev->tx_queue_len = 1;
        nt->parms = *parms;
 
        if (register_netdevice(dev) < 0) {
@@ -833,7 +832,6 @@ int __init sit_init(void)
        }
 
        ipip6_fb_tunnel_dev->init = ipip6_fb_tunnel_init;
-       ipip6_fb_tunnel_dev->tx_queue_len = 1;
 
        if ((err =  register_netdev(ipip6_fb_tunnel_dev)))
                goto fail;