Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@kernel.bkbits.net>2004-02-13 06:05:17 -0800
committerDavid S. Miller <davem@kernel.bkbits.net>2004-02-13 06:05:17 -0800
commitd5acfb1f1a1f324dbd4606b97895402223d085c7 (patch)
treefd97735be73a5d37ab53359e671bdf820e30d334
parentd1c0dfc84a8d1a97db4bf3fc5f67c0fa6e6cd5ec (diff)
parent6bfc53c80bdc59b854d3b230ae9b0fdbe86e081f (diff)
Merge davem@nuts.davemloft.net:/disk1/BK/netfix-2.6
into kernel.bkbits.net:/home/davem/netfix-2.6
-rw-r--r--net/ax25/ax25_route.c2
-rw-r--r--net/ipv4/ip_gre.c2
-rw-r--r--net/ipv4/ipip.c2
-rw-r--r--net/ipv6/sit.c2
4 files changed, 1 insertions, 7 deletions
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index f057dd943e78..7c977ebcc9a0 100644
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
@@ -535,7 +535,7 @@ void __exit ax25_rt_free(void)
{
ax25_route *s, *ax25_rt = ax25_route_list;
- write_unlock(&ax25_route_lock);
+ write_lock(&ax25_route_lock);
while (ax25_rt != NULL) {
s = ax25_rt;
ax25_rt = ax25_rt->next;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 2ec2c7ffb9de..e33f1cd2812b 100644
--- 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 d2553fd38556..0b7e4b21bdfe 100644
--- 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 58598d6d3e09..13c993e164ab 100644
--- 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;