diff options
-rw-r--r-- | modutils/modprobe.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index e1e451943..fd984e446 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -361,21 +361,20 @@ static struct dep_t *build_dep ( void ) | |||
361 | /* return 1 = found, 0 = not found */ | 361 | /* return 1 = found, 0 = not found */ |
362 | static int mod_strcmp ( const char *mod_path, const char *mod_name ) | 362 | static int mod_strcmp ( const char *mod_path, const char *mod_name ) |
363 | { | 363 | { |
364 | #if defined(CONFIG_FEATURE_2_6_MODULES) | ||
365 | #define MODULE_EXTENSION ".ko" | ||
366 | #define MOD_EXTENSION_LEN 3 | ||
367 | #else | ||
368 | #define MODULE_EXTENSION ".o" | ||
369 | #define MOD_EXTENSION_LEN 2 | ||
370 | #endif | ||
371 | /* last path component */ | 364 | /* last path component */ |
372 | const char *last_comp = strrchr (mod_path, '/'); | 365 | const char *last_comp = strrchr (mod_path, '/'); |
366 | const char *mod_ext = ".o"; | ||
367 | |||
368 | #if defined(CONFIG_FEATURE_2_6_MODULES) | ||
369 | if ( k_version > 4 ) | ||
370 | mod_ext = ".ko"; | ||
371 | #endif | ||
373 | 372 | ||
374 | return (strncmp(last_comp ? last_comp + 1 : mod_path, | 373 | return (strncmp(last_comp ? last_comp + 1 : mod_path, |
375 | mod_name, | 374 | mod_name, |
376 | strlen(mod_name)) == 0 ) && | 375 | strlen(mod_name)) == 0 ) && |
377 | (strcmp(mod_path + strlen(mod_path) - | 376 | (strcmp(mod_path + strlen(mod_path) - |
378 | MOD_EXTENSION_LEN, MODULE_EXTENSION) == 0); | 377 | strlen(mod_ext), mod_ext) == 0); |
379 | } | 378 | } |
380 | 379 | ||
381 | /* return 1 = loaded, 0 = not loaded, -1 = can't tell */ | 380 | /* return 1 = loaded, 0 = not loaded, -1 = can't tell */ |