diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /net/rose | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 6 | ||||
| -rw-r--r-- | net/rose/rose_link.c | 4 | ||||
| -rw-r--r-- | net/rose/rose_loopback.c | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index f91baa2eb..1bf9f7ab6 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1453,12 +1453,6 @@ void __init rose_proto_init(struct net_proto *pro) memset(dev_rose, 0x00, rose_ndevs * sizeof(struct net_device)); for (i = 0; i < rose_ndevs; i++) { - dev_rose[i].name = kmalloc(20, GFP_KERNEL); - if(dev_rose[i].name == NULL) - { - printk(KERN_ERR "Rose: unable to register ROSE devices.\n"); - break; - } sprintf(dev_rose[i].name, "rose%d", i); dev_rose[i].init = rose_init; register_netdev(&dev_rose[i]); diff --git a/net/rose/rose_link.c b/net/rose/rose_link.c index 896a372e9..d9b5a4a1d 100644 --- a/net/rose/rose_link.c +++ b/net/rose/rose_link.c @@ -76,12 +76,12 @@ void rose_stop_t0timer(struct rose_neigh *neigh) int rose_ftimer_running(struct rose_neigh *neigh) { - return (neigh->ftimer.prev != NULL || neigh->ftimer.next != NULL); + return timer_pending(&neigh->ftimer); } int rose_t0timer_running(struct rose_neigh *neigh) { - return (neigh->t0timer.prev != NULL || neigh->t0timer.next != NULL); + return timer_pending(&neigh->t0timer); } static void rose_ftimer_expiry(unsigned long param) diff --git a/net/rose/rose_loopback.c b/net/rose/rose_loopback.c index 2aebd4e00..2136fd601 100644 --- a/net/rose/rose_loopback.c +++ b/net/rose/rose_loopback.c @@ -37,7 +37,7 @@ void rose_loopback_init(void) static int rose_loopback_running(void) { - return (loopback_timer.prev != NULL || loopback_timer.next != NULL); + return timer_pending(&loopback_timer); } int rose_loopback_queue(struct sk_buff *skb, struct rose_neigh *neigh) |