diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /drivers/net/wan | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/Config.in | 8 | ||||
| -rw-r--r-- | drivers/net/wan/cosa.c | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/wan/Config.in b/drivers/net/wan/Config.in index 962e171fa..bc4bd5331 100644 --- a/drivers/net/wan/Config.in +++ b/drivers/net/wan/Config.in @@ -51,12 +51,8 @@ if [ "$CONFIG_WAN" = "y" ]; then # X.25 network drivers - if [ "$CONFIG_X25" != "n" ]; then - if [ "$CONFIG_LAPB" != "n" ]; then - dep_tristate 'LAPB over Ethernet driver' CONFIG_LAPBETHER $CONFIG_LAPB - dep_tristate 'X.25 async driver' CONFIG_X25_ASY $CONFIG_LAPB - fi - fi + dep_tristate 'LAPB over Ethernet driver' CONFIG_LAPBETHER $CONFIG_LAPB $CONFIG_X25 + dep_tristate 'X.25 async driver' CONFIG_X25_ASY $CONFIG_LAPB $CONFIG_X25 tristate 'SBNI12-xx support' CONFIG_SBNI fi diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 72aeae112..633514166 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -1,4 +1,4 @@ -/* $Id: cosa.c,v 1.30 2000/02/21 15:19:49 kas Exp $ */ +/* $Id: cosa.c,v 1.31 2000/03/08 17:47:16 kas Exp $ */ /* * Copyright (C) 1995-1997 Jan "Yenya" Kasprzak <kas@fi.muni.cz> @@ -373,7 +373,7 @@ static int __init cosa_init(void) { int i; - printk(KERN_INFO "cosa v1.07 (c) 1997-2000 Jan Kasprzak <kas@fi.muni.cz>\n"); + printk(KERN_INFO "cosa v1.08 (c) 1997-2000 Jan Kasprzak <kas@fi.muni.cz>\n"); #ifdef __SMP__ printk(KERN_INFO "cosa: SMP found. Please mail any success/failure reports to the author.\n"); #endif @@ -584,6 +584,7 @@ static void sppp_channel_init(struct channel_data *chan) struct net_device *d; chan->if_ptr = &chan->pppdev; chan->pppdev.dev = kmalloc(sizeof(struct net_device), GFP_KERNEL); + memset(chan->pppdev.dev, 0, sizeof(struct net_device)); sppp_attach(&chan->pppdev); d=chan->pppdev.dev; d->name = chan->name; @@ -599,7 +600,6 @@ static void sppp_channel_init(struct channel_data *chan) d->get_stats = cosa_net_stats; d->tx_timeout = cosa_sppp_timeout; d->watchdog_timeo = TX_TIMEOUT; - dev_init_buffers(d); if (register_netdev(d) == -1) { printk(KERN_WARNING "%s: register_netdev failed.\n", d->name); sppp_detach(chan->pppdev.dev); @@ -757,7 +757,7 @@ static int sppp_tx_done(struct channel_data *chan, int size) chan->stats.tx_aborted_errors++; return 1; } - dev_kfree_skb(chan->tx_skb); + dev_kfree_skb_irq(chan->tx_skb); chan->tx_skb = 0; chan->stats.tx_packets++; chan->stats.tx_bytes += size; |