forked from luck/tmp_suning_uos_patched
b10aeeef55
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>
56 lines
1.6 KiB
C
56 lines
1.6 KiB
C
/*
|
|
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#ifndef __UM_NET_USER_H__
|
|
#define __UM_NET_USER_H__
|
|
|
|
#define ETH_ADDR_LEN (6)
|
|
#define ETH_HEADER_ETHERTAP (16)
|
|
#define ETH_HEADER_OTHER (14)
|
|
#define ETH_MAX_PACKET (1500)
|
|
|
|
#define UML_NET_VERSION (4)
|
|
|
|
struct net_user_info {
|
|
void (*init)(void *, void *);
|
|
int (*open)(void *);
|
|
void (*close)(int, void *);
|
|
void (*remove)(void *);
|
|
int (*set_mtu)(int mtu, void *);
|
|
void (*add_address)(unsigned char *, unsigned char *, void *);
|
|
void (*delete_address)(unsigned char *, unsigned char *, void *);
|
|
int max_packet;
|
|
};
|
|
|
|
extern void ether_user_init(void *data, void *dev);
|
|
extern void iter_addresses(void *d, void (*cb)(unsigned char *,
|
|
unsigned char *, void *),
|
|
void *arg);
|
|
|
|
extern void *get_output_buffer(int *len_out);
|
|
extern void free_output_buffer(void *buffer);
|
|
|
|
extern int tap_open_common(void *dev, char *gate_addr);
|
|
extern void tap_check_ips(char *gate_addr, unsigned char *eth_addr);
|
|
|
|
extern void read_output(int fd, char *output_out, int len);
|
|
|
|
extern int net_read(int fd, void *buf, int len);
|
|
extern int net_recvfrom(int fd, void *buf, int len);
|
|
extern int net_write(int fd, void *buf, int len);
|
|
extern int net_send(int fd, void *buf, int len);
|
|
extern int net_sendto(int fd, void *buf, int len, void *to, int sock_len);
|
|
|
|
extern void open_addr(unsigned char *addr, unsigned char *netmask, void *arg);
|
|
extern void close_addr(unsigned char *addr, unsigned char *netmask, void *arg);
|
|
|
|
extern char *split_if_spec(char *str, ...);
|
|
|
|
extern int dev_netmask(void *d, void *m);
|
|
|
|
extern void random_mac(unsigned char *addr);
|
|
|
|
#endif
|