diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /net/x25/af_x25.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'net/x25/af_x25.c')
| -rw-r--r-- | net/x25/af_x25.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index e7f894e8e..a4f070023 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1336,14 +1336,17 @@ int init_module(void) /* * Register any pre existing devices. */ - for (dev = dev_base; dev != NULL; dev = dev->next) + read_lock(&dev_base_lock); + for (dev = dev_base; dev != NULL; dev = dev->next) { if ((dev->flags & IFF_UP) && (dev->type == ARPHRD_X25 #if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) || dev->type == ARPHRD_ETHER #endif - )) - x25_link_device_up(dev); - + )) + x25_link_device_up(dev); + } + read_unlock(&dev_base_lock); + return 0; } |