Changeset d40cbce in freewrt for target/linux

Timestamp:

Jul 17, 2006, 5:06:35 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

83201d3

Parents:

30d630b

Message:

use whiterussian switch drivers

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@269 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

target/linux/package/switch/src

Files:

• switch-core.c (modified) (1 diff)
• switch-core.h (modified) (1 diff)
• switch-robo.c (modified) (5 diffs)

target/linux/package/switch/src/switch-core.c

@@ -68 +68 @@
         write: switch_proc_write
 };
+
+static inline char *strdup(char *str)
+{
+        char *new = kmalloc(strlen(str) + 1, GFP_KERNEL);
+        strcpy(new, str);
+        return new;
+}
 
 static ssize_t switch_proc_read(struct file *file, char *buf, size_t count, loff_t *ppos)

target/linux/package/switch/src/switch-core.h

@@ -49 +49 @@
 extern int switch_print_media(char *buf, int media);
 
-static inline char *strdup(char *str)
-{
-        char *new = kmalloc(strlen(str) + 1, GFP_KERNEL);
-        strcpy(new, str);
-        return new;
-}
-
-
 #endif

target/linux/package/switch/src/switch-robo.c

@@ -52 +52 @@
 #define SIOCSETCPHYWR           (SIOCDEVPRIVATE + 10)
 
-static char *device;
 static int use_et = 0;
 static int is_5350 = 0;
@@ -315 +314 @@
                 }
         }
-
+        
         buf[len] = '\0';
 
@@ -429 +428 @@
 static int __init robo_init()
 {
+        char *device = "ethX";
         int notfound = 1;
 
-        device = strdup("ethX");
         for (device[3] = '0'; (device[3] <= '3') && notfound; device[3]++) {
                 notfound = robo_probe(device);
@@ -437 +436 @@
         device[3]--;
         
-        if (notfound) {
-                kfree(device);
+        if (notfound)
                 return -ENODEV;
-        } else {
+        else {
                 switch_config cfg[] = {
                         {"enable", handle_enable_read, handle_enable_write},
@@ -470 +468 @@
 {
         switch_unregister_driver(DRIVER_NAME);
-        kfree(device);
 }