diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2003-05-15 11:17:01 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2003-05-15 11:17:01 -0300 |
| commit | 7a2d9c1020e3aa7e0f4a64211ea578af2f3c10cd (patch) | |
| tree | d0f6fb1a2d670ec894e1420f011e5e17059c6036 /include/linux | |
| parent | 77b3055a2a25b7ba9f5718651e7e89e5952d4912 (diff) | |
o wanrouter: don't use typedefs for wan_device, just struct wan_device
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cyclomx.h | 2 | ||||
| -rw-r--r-- | include/linux/wanpipe.h | 2 | ||||
| -rw-r--r-- | include/linux/wanrouter.h | 13 |
3 files changed, 8 insertions, 9 deletions
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index 1d39011731b6..a7aced1ad638 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h @@ -46,7 +46,7 @@ typedef struct cycx { char devname[WAN_DRVNAME_SZ+1]; /* card name */ cycxhw_t hw; /* hardware configuration */ - wan_device_t wandev; /* WAN device data space */ + struct wan_device wandev; /* WAN device data space */ u32 open_cnt; /* number of open interfaces */ u32 state_tick; /* link state timestamp */ spinlock_t lock; diff --git a/include/linux/wanpipe.h b/include/linux/wanpipe.h index a4c4e89191ee..74f4a42c2517 100644 --- a/include/linux/wanpipe.h +++ b/include/linux/wanpipe.h @@ -286,7 +286,7 @@ typedef struct sdla { char devname[WAN_DRVNAME_SZ+1]; /* card name */ sdlahw_t hw; /* hardware configuration */ - wan_device_t wandev; /* WAN device data space */ + struct wan_device wandev; /* WAN device data space */ unsigned open_cnt; /* number of open interfaces */ unsigned long state_tick; /* link state timestamp */ diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h index 0879f677eca6..e5b088722aca 100644 --- a/include/linux/wanrouter.h +++ b/include/linux/wanrouter.h @@ -462,8 +462,7 @@ typedef struct wanif_conf /*---------------------------------------------------------------------------- * WAN device data space. */ -typedef struct wan_device -{ +struct wan_device { unsigned magic; /* magic number */ char* name; /* -> WAN device name (ASCIIZ) */ void* private; /* -> driver private data */ @@ -514,10 +513,10 @@ typedef struct wan_device netdevice_t* dev; /* list of network interfaces */ unsigned ndev; /* number of interfaces */ struct proc_dir_entry *dent; /* proc filesystem entry */ -} wan_device_t; +}; /* Public functions available for device drivers */ -extern int register_wan_device(wan_device_t *wandev); +extern int register_wan_device(struct wan_device *wandev); extern int unregister_wan_device(char *name); unsigned short wanrouter_type_trans(struct sk_buff *skb, netdevice_t *dev); int wanrouter_encapsulate(struct sk_buff *skb, netdevice_t *dev,unsigned short type); @@ -525,8 +524,8 @@ int wanrouter_encapsulate(struct sk_buff *skb, netdevice_t *dev,unsigned short t /* Proc interface functions. These must not be called by the drivers! */ extern int wanrouter_proc_init(void); extern void wanrouter_proc_cleanup(void); -extern int wanrouter_proc_add(wan_device_t *wandev); -extern int wanrouter_proc_delete(wan_device_t *wandev); +extern int wanrouter_proc_add(struct wan_device *wandev); +extern int wanrouter_proc_delete(struct wan_device *wandev); extern int wanrouter_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); extern void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); @@ -535,7 +534,7 @@ extern void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); /* Public Data */ -extern wan_device_t *router_devlist; /* list of registered devices */ +extern struct wan_device *router_devlist; /* list of registered devices */ #endif /* __KERNEL__ */ #endif /* _ROUTER_H */ |