aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include/net_user.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-09-29 04:58:50 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:04 -0400
commitb10aeeef554eb1ff80e10111829f6e7484877811 (patch)
treeefe33871539700cb6f530ed38b755b405b3f3b08 /arch/um/include/net_user.h
parentf3e7ed2b617824f79d1223f37430ccffae59e5b8 (diff)
[PATCH] uml: mechanical tidying after random MACs change
Mechanical, hopefully non-functional changes stemming from setup_etheraddr always succeeding now that it always assigns a MAC, either from the command line or generated randomly: the test of the return of setup_etheraddr is removed, and code dependent on it succeeding is now unconditional setup_etheraddr can now be made void struct uml_net.have_mac is now always 1, so tests of it can be similarly removed, and uses of it can be replaced with 1 struct uml_net.have_mac is no longer used, so it can be removed struct uml_net_private.have_mac is copied from struct uml_net, so it is always 1 tests of uml_net_private.have_mac can be removed uml_net_private.have_mac can now be removed the only call to dev_ip_addr was removed, so it can be deleted It also turns out that setup_etheraddr is called only once, from the same file, so it can be static and its declaration removed from net_kern.h. Similarly, set_ether_mac is defined and called only from one file. Finally, setup_etheraddr and set_ether_mac were moved to avoid needing forward declarations. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/include/net_user.h')
-rw-r--r--arch/um/include/net_user.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/include/net_user.h b/arch/um/include/net_user.h
index cd19defbfefc..99b3cea2dcdc 100644
--- a/arch/um/include/net_user.h
+++ b/arch/um/include/net_user.h
@@ -25,7 +25,6 @@ struct net_user_info {
25}; 25};
26 26
27extern void ether_user_init(void *data, void *dev); 27extern void ether_user_init(void *data, void *dev);
28extern void dev_ip_addr(void *d, unsigned char *bin_buf);
29extern void iter_addresses(void *d, void (*cb)(unsigned char *, 28extern void iter_addresses(void *d, void (*cb)(unsigned char *,
30 unsigned char *, void *), 29 unsigned char *, void *),
31 void *arg); 30 void *arg);