f34d9d2dcb
This fixes a number of problems associated with network interface hotplug. The userspace initialization function can fail in some cases, but the failure was never passed back to eth_configure, which proceeded with the configuration. This results in a zombie device that is present, but can't work. This is fixed by allowing the initialization routines to return an error, which is checked, and the configuration aborted on failure. eth_configure failed to check for many failures. Even when it did check, it didn't undo whatever initializations has already happened, so a present, but partially initialized and non-working device could result. It now checks everything that can fail, and bails out, undoing whatever had been done. The return value of eth_configure was always ignored, so it is now just void. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
54 lines
1.5 KiB
C
54 lines
1.5 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 {
|
|
int (*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);
|
|
|
|
#endif
|