Commit 5c0e5824 authored by David S. Miller's avatar David S. Miller

Merge bk://kernel.bkbits.net/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents cd202cba 953f3bde
...@@ -534,7 +534,8 @@ extern void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); ...@@ -534,7 +534,8 @@ extern void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);
/* Public Data */ /* Public Data */
extern struct wan_device *router_devlist; /* list of registered devices */ /* list of registered devices */
extern struct wan_device *wanrouter_router_devlist;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ROUTER_H */ #endif /* _ROUTER_H */
...@@ -87,7 +87,8 @@ static void *r_start(struct seq_file *m, loff_t *pos) ...@@ -87,7 +87,8 @@ static void *r_start(struct seq_file *m, loff_t *pos)
lock_kernel(); lock_kernel();
if (!l--) if (!l--)
return (void *)1; return (void *)1;
for (wandev = router_devlist; l-- && wandev; wandev = wandev->next) for (wandev = wanrouter_router_devlist; l-- && wandev;
wandev = wandev->next)
; ;
return wandev; return wandev;
} }
...@@ -96,7 +97,7 @@ static void *r_next(struct seq_file *m, void *v, loff_t *pos) ...@@ -96,7 +97,7 @@ static void *r_next(struct seq_file *m, void *v, loff_t *pos)
{ {
struct wan_device *wandev = v; struct wan_device *wandev = v;
(*pos)++; (*pos)++;
return (v == (void *)1) ? router_devlist : wandev->next; return (v == (void *)1) ? wanrouter_router_devlist : wandev->next;
} }
static void r_stop(struct seq_file *m, void *v) static void r_stop(struct seq_file *m, void *v)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment