[ATM]: [lec] header indent, comment and whitespace cleanup

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Chas Williams 2006-09-29 17:13:24 -07:00 committed by David S. Miller
parent 1fa9961d63
commit 1c9d3e72a7
3 changed files with 235 additions and 204 deletions
include/linux
net/atm

View file

@ -1,9 +1,7 @@
/* /*
* ATM Lan Emulation Daemon driver interface
* *
* ATM Lan Emulation Daemon vs. driver interface * Marko Kiiskila <mkiiskila@yahoo.com>
*
* mkiiskila@yahoo.com
*
*/ */
#ifndef _ATMLEC_H_ #ifndef _ATMLEC_H_
@ -13,6 +11,7 @@
#include <linux/atmioc.h> #include <linux/atmioc.h>
#include <linux/atm.h> #include <linux/atm.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
/* ATM lec daemon control socket */ /* ATM lec daemon control socket */
#define ATMLEC_CTRL _IO('a', ATMIOC_LANE) #define ATMLEC_CTRL _IO('a', ATMIOC_LANE)
#define ATMLEC_DATA _IO('a', ATMIOC_LANE+1) #define ATMLEC_DATA _IO('a', ATMIOC_LANE+1)
@ -21,20 +20,26 @@
/* Maximum number of LEC interfaces (tweakable) */ /* Maximum number of LEC interfaces (tweakable) */
#define MAX_LEC_ITF 48 #define MAX_LEC_ITF 48
/* From the total of MAX_LEC_ITF, last NUM_TR_DEVS are reserved for Token Ring. /*
* From the total of MAX_LEC_ITF, last NUM_TR_DEVS are reserved for Token Ring.
* E.g. if MAX_LEC_ITF = 48 and NUM_TR_DEVS = 8, then lec0-lec39 are for * E.g. if MAX_LEC_ITF = 48 and NUM_TR_DEVS = 8, then lec0-lec39 are for
* Ethernet ELANs and lec40-lec47 are for Token Ring ELANS. * Ethernet ELANs and lec40-lec47 are for Token Ring ELANS.
*/ */
#define NUM_TR_DEVS 8 #define NUM_TR_DEVS 8
typedef enum { typedef enum {
l_set_mac_addr, l_del_mac_addr, l_set_mac_addr,
l_del_mac_addr,
l_svc_setup, l_svc_setup,
l_addr_delete, l_topology_change, l_addr_delete,
l_flush_complete, l_arp_update, l_topology_change,
l_flush_complete,
l_arp_update,
l_narp_req, /* LANE2 mandates the use of this */ l_narp_req, /* LANE2 mandates the use of this */
l_config, l_flush_tran_id, l_config,
l_set_lecid, l_arp_xmt, l_flush_tran_id,
l_set_lecid,
l_arp_xmt,
l_rdesc_arp_xmt, l_rdesc_arp_xmt,
l_associate_req, l_associate_req,
l_should_bridge /* should we bridge this MAC? */ l_should_bridge /* should we bridge this MAC? */
@ -63,9 +68,11 @@ struct atmlec_msg {
struct { struct {
unsigned char mac_addr[ETH_ALEN]; unsigned char mac_addr[ETH_ALEN];
unsigned char atm_addr[ATM_ESA_LEN]; unsigned char atm_addr[ATM_ESA_LEN];
unsigned int flag;/* Topology_change flag, unsigned int flag; /*
remoteflag, permanent flag, * Topology_change flag,
lecid, transaction id */ * remoteflag, permanent flag,
* lecid, transaction id
*/
unsigned int targetless_le_arp; /* LANE2 */ unsigned int targetless_le_arp; /* LANE2 */
unsigned int no_source_le_narp; /* LANE2 */ unsigned int no_source_le_narp; /* LANE2 */
} normal; } normal;
@ -75,9 +82,11 @@ struct atmlec_msg {
uint32_t tran_id; /* transaction id */ uint32_t tran_id; /* transaction id */
unsigned char mac_addr[ETH_ALEN]; /* dst mac addr */ unsigned char mac_addr[ETH_ALEN]; /* dst mac addr */
unsigned char atm_addr[ATM_ESA_LEN]; /* reqestor ATM addr */ unsigned char atm_addr[ATM_ESA_LEN]; /* reqestor ATM addr */
} proxy; } proxy; /*
/* For mapping LE_ARP requests to responses. Filled by */ * For mapping LE_ARP requests to responses. Filled by
} content; /* zeppelin, returned by kernel. Used only when proxying */ * zeppelin, returned by kernel. Used only when proxying
*/
} content;
} __ATM_API_ALIGN; } __ATM_API_ALIGN;
struct atmlec_ioc { struct atmlec_ioc {

View file

@ -1,14 +1,13 @@
/* /*
*
* Lan Emulation client header file * Lan Emulation client header file
* *
* Marko Kiiskila mkiiskila@yahoo.com * Marko Kiiskila <mkiiskila@yahoo.com>
*
*/ */
#ifndef _LEC_H_ #ifndef _LEC_H_
#define _LEC_H_ #define _LEC_H_
#include <linux/config.h>
#include <linux/atmdev.h> #include <linux/atmdev.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/atmlec.h> #include <linux/atmlec.h>
@ -55,6 +54,7 @@ struct lane2_ops {
/* /*
* ATM LAN Emulation supports both LLC & Dix Ethernet EtherType * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
* frames. * frames.
*
* 1. Dix Ethernet EtherType frames encoded by placing EtherType * 1. Dix Ethernet EtherType frames encoded by placing EtherType
* field in h_type field. Data follows immediatelly after header. * field in h_type field. Data follows immediatelly after header.
* 2. LLC Data frames whose total length, including LLC field and data, * 2. LLC Data frames whose total length, including LLC field and data,
@ -77,48 +77,65 @@ struct lec_priv {
struct lec_arp_table *lec_arp_tables[LEC_ARP_TABLE_SIZE]; struct lec_arp_table *lec_arp_tables[LEC_ARP_TABLE_SIZE];
/* Actual LE ARP table */ /* Actual LE ARP table */
struct lec_arp_table *lec_no_forward; struct lec_arp_table *lec_no_forward;
/* Used for storing VCC's (and forward packets from) which are to /*
age out by not using them to forward packets. * Used for storing VCC's (and forward packets from) which are to
This is because to some LE clients there will be 2 VCCs. Only * age out by not using them to forward packets.
one of them gets used. */ * This is because to some LE clients there will be 2 VCCs. Only
* one of them gets used.
*/
struct lec_arp_table *mcast_fwds; struct lec_arp_table *mcast_fwds;
/* With LANEv2 it is possible that BUS (or a special multicast server) /*
establishes multiple Multicast Forward VCCs to us. This list * With LANEv2 it is possible that BUS (or a special multicast server)
collects all those VCCs. LANEv1 client has only one item in this * establishes multiple Multicast Forward VCCs to us. This list
list. These entries are not aged out. */ * collects all those VCCs. LANEv1 client has only one item in this
* list. These entries are not aged out.
*/
spinlock_t lec_arp_lock; spinlock_t lec_arp_lock;
struct atm_vcc *mcast_vcc; /* Default Multicast Send VCC */ struct atm_vcc *mcast_vcc; /* Default Multicast Send VCC */
struct atm_vcc *lecd; struct atm_vcc *lecd;
struct timer_list lec_arp_timer; struct timer_list lec_arp_timer; /* C10 */
/* C10 */
unsigned int maximum_unknown_frame_count; unsigned int maximum_unknown_frame_count;
/* Within the period of time defined by this variable, the client will send /*
no more than C10 frames to BUS for a given unicast destination. (C11) */ * Within the period of time defined by this variable, the client will send
* no more than C10 frames to BUS for a given unicast destination. (C11)
*/
unsigned long max_unknown_frame_time; unsigned long max_unknown_frame_time;
/* If no traffic has been sent in this vcc for this period of time, /*
vcc will be torn down (C12)*/ * If no traffic has been sent in this vcc for this period of time,
* vcc will be torn down (C12)
*/
unsigned long vcc_timeout_period; unsigned long vcc_timeout_period;
/* An LE Client MUST not retry an LE_ARP_REQUEST for a /*
given frame's LAN Destination more than maximum retry count times, * An LE Client MUST not retry an LE_ARP_REQUEST for a
after the first LEC_ARP_REQUEST (C13)*/ * given frame's LAN Destination more than maximum retry count times,
* after the first LEC_ARP_REQUEST (C13)
*/
unsigned short max_retry_count; unsigned short max_retry_count;
/* Max time the client will maintain an entry in its arp cache in /*
absence of a verification of that relationship (C17)*/ * Max time the client will maintain an entry in its arp cache in
* absence of a verification of that relationship (C17)
*/
unsigned long aging_time; unsigned long aging_time;
/* Max time the client will maintain an entry in cache when /*
topology change flag is true (C18) */ * Max time the client will maintain an entry in cache when
unsigned long forward_delay_time; * topology change flag is true (C18)
/* Topology change flag (C19)*/ */
unsigned long forward_delay_time; /* Topology change flag (C19) */
int topology_change; int topology_change;
/* Max time the client expects an LE_ARP_REQUEST/LE_ARP_RESPONSE /*
cycle to take (C20)*/ * Max time the client expects an LE_ARP_REQUEST/LE_ARP_RESPONSE
* cycle to take (C20)
*/
unsigned long arp_response_time; unsigned long arp_response_time;
/* Time limit ot wait to receive an LE_FLUSH_RESPONSE after the /*
LE_FLUSH_REQUEST has been sent before taking recover action. (C21)*/ * Time limit ot wait to receive an LE_FLUSH_RESPONSE after the
* LE_FLUSH_REQUEST has been sent before taking recover action. (C21)
*/
unsigned long flush_timeout; unsigned long flush_timeout;
/* The time since sending a frame to the bus after which the /* The time since sending a frame to the bus after which the
LE Client may assume that the frame has been either discarded or * LE Client may assume that the frame has been either discarded or
delivered to the recipient (C22) */ * delivered to the recipient (C22)
*/
unsigned long path_switching_delay; unsigned long path_switching_delay;
u8 *tlvs; /* LANE2: TLVs are new */ u8 *tlvs; /* LANE2: TLVs are new */
@ -138,4 +155,3 @@ struct lec_vcc_priv {
#define LEC_VCC_PRIV(vcc) ((struct lec_vcc_priv *)((vcc)->user_back)) #define LEC_VCC_PRIV(vcc) ((struct lec_vcc_priv *)((vcc)->user_back))
#endif /* _LEC_H_ */ #endif /* _LEC_H_ */

View file

@ -1,10 +1,10 @@
/* /*
* Lec arp cache * Lec arp cache
* Marko Kiiskila mkiiskila@yahoo.com
* *
* Marko Kiiskila <mkiiskila@yahoo.com>
*/ */
#ifndef _LEC_ARP_H #ifndef _LEC_ARP_H_
#define _LEC_ARP_H #define _LEC_ARP_H_
#include <linux/atm.h> #include <linux/atm.h>
#include <linux/atmdev.h> #include <linux/atmdev.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
@ -17,16 +17,18 @@ struct lec_arp_table {
int is_rdesc; /* Mac address is a route descriptor */ int is_rdesc; /* Mac address is a route descriptor */
struct atm_vcc *vcc; /* Vcc this entry is attached */ struct atm_vcc *vcc; /* Vcc this entry is attached */
struct atm_vcc *recv_vcc; /* Vcc we receive data from */ struct atm_vcc *recv_vcc; /* Vcc we receive data from */
void (*old_push) (struct atm_vcc *vcc, struct sk_buff *skb); void (*old_push) (struct atm_vcc *vcc, struct sk_buff *skb);
/* Push that leads to daemon */ /* Push that leads to daemon */
void (*old_recv_push) (struct atm_vcc *vcc, struct sk_buff *skb); void (*old_recv_push) (struct atm_vcc *vcc, struct sk_buff *skb);
/* Push that leads to daemon */ /* Push that leads to daemon */
void (*old_close) (struct atm_vcc *vcc); void (*old_close) (struct atm_vcc *vcc);
/* We want to see when this /* We want to see when this vcc gets closed */
* vcc gets closed */
unsigned long last_used; /* For expiry */ unsigned long last_used; /* For expiry */
unsigned long timestamp; /* Used for various timestamping unsigned long timestamp; /* Used for various timestamping things:
* things:
* 1. FLUSH started * 1. FLUSH started
* (status=ESI_FLUSH_PENDING) * (status=ESI_FLUSH_PENDING)
* 2. Counting to * 2. Counting to
@ -34,23 +36,27 @@ struct lec_arp_table {
* (status=ESI_ARP_PENDING|| * (status=ESI_ARP_PENDING||
* status=ESI_VC_PENDING) * status=ESI_VC_PENDING)
*/ */
unsigned char no_tries; /* No of times arp retry has been unsigned char no_tries; /* No of times arp retry has been tried */
tried */
unsigned char status; /* Status of this entry */ unsigned char status; /* Status of this entry */
unsigned short flags; /* Flags for this entry */ unsigned short flags; /* Flags for this entry */
unsigned short packets_flooded; /* Data packets flooded */ unsigned short packets_flooded; /* Data packets flooded */
unsigned long flush_tran_id; /* Transaction id in flush protocol */ unsigned long flush_tran_id; /* Transaction id in flush protocol */
struct timer_list timer; /* Arping timer */ struct timer_list timer; /* Arping timer */
struct lec_priv *priv; /* Pointer back */ struct lec_priv *priv; /* Pointer back */
u8 *tlvs;
u8 *tlvs; /* LANE2: Each MAC address can have TLVs */ u32 sizeoftlvs; /*
u32 sizeoftlvs; /* associated with it. sizeoftlvs tells the */ * LANE2: Each MAC address can have TLVs
/* the length of the tlvs array */ * associated with it. sizeoftlvs tells the
* the length of the tlvs array
*/
struct sk_buff_head tx_wait; /* wait queue for outgoing packets */ struct sk_buff_head tx_wait; /* wait queue for outgoing packets */
}; };
struct tlv { /* LANE2: Template tlv struct for accessing */ /*
/* the tlvs in the lec_arp_table->tlvs array*/ * LANE2: Template tlv struct for accessing
* the tlvs in the lec_arp_table->tlvs array
*/
struct tlv {
u32 type; u32 type;
u8 length; u8 length;
u8 value[255]; u8 value[255];
@ -89,4 +95,4 @@ struct tlv { /* LANE2: Template tlv struct for accessing */
#define LEC_REMOTE_FLAG 0x0001 #define LEC_REMOTE_FLAG 0x0001
#define LEC_PERMANENT_FLAG 0x0002 #define LEC_PERMANENT_FLAG 0x0002
#endif #endif /* _LEC_ARP_H_ */