diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-09-26 02:23:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-09-26 02:23:23 -0700 |
| commit | cbb6ac6dfbfc79eed753901ec59f562af27ae418 (patch) | |
| tree | 14c71d5388d44627798b93aafde1a1cdd8e5058c /include/net | |
| parent | 464f9b3f5830aa3b74e6d1491193d29f1074151d (diff) | |
| parent | 95c783fa559f5c214d54cbe3e56e388a6c5966db (diff) | |
Merge master.kernel.org:/home/acme/BK/x25-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/x25.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/net/x25.h b/include/net/x25.h index 4d5c3a84e9dc..82fbb74f1765 100644 --- a/include/net/x25.h +++ b/include/net/x25.h @@ -103,9 +103,9 @@ enum { struct x25_route { struct x25_route *next; - x25_address address; /* Start of address range */ + struct x25_address address; /* Start of address range */ unsigned int sigdigits; /* Number of sig digits */ - struct net_device *dev; /* More than one for MLP */ + struct net_device *dev; /* More than one for MLP */ }; struct x25_neigh { @@ -120,7 +120,7 @@ struct x25_neigh { }; typedef struct { - x25_address source_addr, dest_addr; + struct x25_address source_addr, dest_addr; struct x25_neigh *neighbour; unsigned int lci; unsigned char state, condition, qbitincl, intflag; @@ -148,8 +148,10 @@ extern int sysctl_x25_reset_request_timeout; extern int sysctl_x25_clear_request_timeout; extern int sysctl_x25_ack_holdback_timeout; -extern int x25_addr_ntoa(unsigned char *, x25_address *, x25_address *); -extern int x25_addr_aton(unsigned char *, x25_address *, x25_address *); +extern int x25_addr_ntoa(unsigned char *, struct x25_address *, + struct x25_address *); +extern int x25_addr_aton(unsigned char *, struct x25_address *, + struct x25_address *); extern unsigned int x25_new_lci(struct x25_neigh *); extern struct sock *x25_find_socket(unsigned int, struct x25_neigh *); extern void x25_destroy_socket(struct sock *); @@ -194,7 +196,7 @@ extern void x25_kick(struct sock *); extern void x25_enquiry_response(struct sock *); /* x25_route.c */ -extern struct net_device *x25_get_route(x25_address *); +extern struct net_device *x25_get_route(struct x25_address *); extern struct net_device *x25_dev_get(char *); extern void x25_route_device_down(struct net_device *); extern int x25_route_ioctl(unsigned int, void *); |