Commit c8e0c32b authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/netfix-2.6

into home.osdl.org:/home/torvalds/v2.5/linux
parents 573a8eb5 a7344fb9
...@@ -276,6 +276,7 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int ...@@ -276,6 +276,7 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int
return NULL; return NULL;
dev->init = ipgre_tunnel_init; dev->init = ipgre_tunnel_init;
dev->tx_queue_len = 1;
nt = dev->priv; nt = dev->priv;
nt->parms = *parms; nt->parms = *parms;
...@@ -1269,6 +1270,7 @@ int __init ipgre_init(void) ...@@ -1269,6 +1270,7 @@ int __init ipgre_init(void)
} }
ipgre_fb_tunnel_dev->init = ipgre_fb_tunnel_init; 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))) if ((err = register_netdev(ipgre_fb_tunnel_dev)))
goto fail; goto fail;
......
...@@ -246,6 +246,7 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c ...@@ -246,6 +246,7 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c
nt = dev->priv; nt = dev->priv;
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
dev->init = ipip_tunnel_init; dev->init = ipip_tunnel_init;
dev->tx_queue_len = 1;
dev->destructor = free_netdev; dev->destructor = free_netdev;
nt->parms = *parms; nt->parms = *parms;
...@@ -892,6 +893,7 @@ int __init ipip_init(void) ...@@ -892,6 +893,7 @@ int __init ipip_init(void)
} }
ipip_fb_tunnel_dev->init = ipip_fb_tunnel_init; 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))) if ((err = register_netdev(ipip_fb_tunnel_dev)))
goto fail; goto fail;
......
...@@ -184,6 +184,7 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int ...@@ -184,6 +184,7 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int
nt = dev->priv; nt = dev->priv;
dev->init = ipip6_tunnel_init; dev->init = ipip6_tunnel_init;
dev->tx_queue_len = 1;
nt->parms = *parms; nt->parms = *parms;
if (register_netdevice(dev) < 0) { if (register_netdevice(dev) < 0) {
...@@ -832,6 +833,7 @@ int __init sit_init(void) ...@@ -832,6 +833,7 @@ int __init sit_init(void)
} }
ipip6_fb_tunnel_dev->init = ipip6_fb_tunnel_init; 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))) if ((err = register_netdev(ipip6_fb_tunnel_dev)))
goto fail; goto fail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment