diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/linux/atmlec.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/linux/atmlec.h')
| -rw-r--r-- | include/linux/atmlec.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/linux/atmlec.h b/include/linux/atmlec.h index 6b1be5adf..dd6b349a0 100644 --- a/include/linux/atmlec.h +++ b/include/linux/atmlec.h @@ -9,6 +9,7 @@ #ifndef _ATMLEC_H_ #define _ATMLEC_H_ +#include <linux/atmapi.h> #include <linux/atmioc.h> #include <linux/atm.h> #include <linux/if_ether.h> @@ -43,15 +44,16 @@ typedef enum { struct atmlec_config_msg { unsigned int maximum_unknown_frame_count; - unsigned long max_unknown_frame_time; + unsigned int max_unknown_frame_time; unsigned short max_retry_count; - unsigned long aging_time; - unsigned long forward_delay_time; - unsigned long arp_response_time; - unsigned long flush_timeout; - unsigned long path_switching_delay; + unsigned int aging_time; + unsigned int forward_delay_time; + unsigned int arp_response_time; + unsigned int flush_timeout; + unsigned int path_switching_delay; unsigned int lane_version; /* LANE2: 1 for LANEv1, 2 for LANEv2 */ int mtu; + int is_proxy; }; struct atmlec_msg { @@ -61,7 +63,7 @@ struct atmlec_msg { struct { unsigned char mac_addr[ETH_ALEN]; unsigned char atm_addr[ATM_ESA_LEN]; - unsigned long flag;/* Topology_change flag, + unsigned int flag;/* Topology_change flag, remoteflag, permanent flag, lecid, transaction id */ unsigned int targetless_le_arp; /* LANE2 */ @@ -73,9 +75,10 @@ struct atmlec_msg { uint32_t tran_id; /* transaction id */ unsigned char mac_addr[ETH_ALEN]; /* dst mac addr */ unsigned char atm_addr[ATM_ESA_LEN]; /* reqestor ATM addr */ - } proxy; /* For mapping LE_ARP requests to responses. Filled by */ + } proxy; + /* For mapping LE_ARP requests to responses. Filled by */ } content; /* zeppelin, returned by kernel. Used only when proxying */ -}; +} __ATM_API_ALIGN; struct atmlec_ioc { int dev_num; |