Skip to content

L
linux-davinci
Commit 1c9d3e72 authored by Chas Williams's avatar Chas Williams Committed by David S. Miller
Browse files
Options

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

Signed-off-by: default avatarChas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1fa9961d
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 204 deletions
include/linux/atmlec.h
View file @ 1c9d3e72
/* /*
* * ATM Lan Emulation Daemon driver interface
* ATM Lan Emulation Daemon vs. driver interface
*
* mkiiskila@yahoo.com
* *
* Marko Kiiskila <mkiiskila@yahoo.com>
*/ */
#ifndef _ATMLEC_H_ #ifndef _ATMLEC_H_
...@@ -13,76 +11,87 @@ ...@@ -13,76 +11,87 @@
#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)
#define ATMLEC_MCAST _IO('a',ATMIOC_LANE+2) #define ATMLEC_MCAST _IO('a', ATMIOC_LANE+2)
/* 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_svc_setup, l_del_mac_addr,
l_addr_delete, l_topology_change, l_svc_setup,
l_flush_complete, l_arp_update, l_addr_delete,
l_narp_req, /* LANE2 mandates the use of this */ l_topology_change,
l_config, l_flush_tran_id, l_flush_complete,
l_set_lecid, l_arp_xmt, l_arp_update,
l_rdesc_arp_xmt, l_narp_req, /* LANE2 mandates the use of this */
l_associate_req, l_config,
l_should_bridge /* should we bridge this MAC? */ l_flush_tran_id,
l_set_lecid,
l_arp_xmt,
l_rdesc_arp_xmt,
l_associate_req,
l_should_bridge /* should we bridge this MAC? */
} atmlec_msg_type; } atmlec_msg_type;
#define ATMLEC_MSG_TYPE_MAX l_should_bridge #define ATMLEC_MSG_TYPE_MAX l_should_bridge
struct atmlec_config_msg { struct atmlec_config_msg {
unsigned int maximum_unknown_frame_count; unsigned int maximum_unknown_frame_count;
unsigned int max_unknown_frame_time; unsigned int max_unknown_frame_time;
unsigned short max_retry_count; unsigned short max_retry_count;
unsigned int aging_time; unsigned int aging_time;
unsigned int forward_delay_time; unsigned int forward_delay_time;
unsigned int arp_response_time; unsigned int arp_response_time;
unsigned int flush_timeout; unsigned int flush_timeout;
unsigned int path_switching_delay; unsigned int path_switching_delay;
unsigned int lane_version; /* LANE2: 1 for LANEv1, 2 for LANEv2 */ unsigned int lane_version; /* LANE2: 1 for LANEv1, 2 for LANEv2 */
int mtu; int mtu;
int is_proxy; int is_proxy;
}; };
struct atmlec_msg { struct atmlec_msg {
atmlec_msg_type type; atmlec_msg_type type;
int sizeoftlvs; /* LANE2: if != 0, tlvs follow */ int sizeoftlvs; /* LANE2: if != 0, tlvs follow */
union { union {
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,
unsigned int targetless_le_arp; /* LANE2 */ * lecid, transaction id
unsigned int no_source_le_narp; /* LANE2 */ */
} normal; unsigned int targetless_le_arp; /* LANE2 */
struct atmlec_config_msg config; unsigned int no_source_le_narp; /* LANE2 */
struct { } normal;
uint16_t lec_id; /* requestor lec_id */ struct atmlec_config_msg config;
uint32_t tran_id; /* transaction id */ struct {
unsigned char mac_addr[ETH_ALEN]; /* dst mac addr */ uint16_t lec_id; /* requestor lec_id */
unsigned char atm_addr[ATM_ESA_LEN]; /* reqestor ATM addr */ uint32_t tran_id; /* transaction id */
} proxy; unsigned char mac_addr[ETH_ALEN]; /* dst mac addr */
/* For mapping LE_ARP requests to responses. Filled by */ unsigned char atm_addr[ATM_ESA_LEN]; /* reqestor ATM addr */
} content; /* zeppelin, returned by kernel. Used only when proxying */ } proxy; /*
* For mapping LE_ARP requests to responses. Filled by
* zeppelin, returned by kernel. Used only when proxying
*/
} content;
} __ATM_API_ALIGN; } __ATM_API_ALIGN;
struct atmlec_ioc { struct atmlec_ioc {
int dev_num; int dev_num;
unsigned char atm_addr[ATM_ESA_LEN]; unsigned char atm_addr[ATM_ESA_LEN];
unsigned char receive; /* 1= receive vcc, 0 = send vcc */ unsigned char receive; /* 1= receive vcc, 0 = send vcc */
}; };
#endif /* _ATMLEC_H_ */ #endif /* _ATMLEC_H_ */
net/atm/lec.h
View file @ 1c9d3e72
/* /*
*
* 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>
...@@ -16,18 +15,18 @@ ...@@ -16,18 +15,18 @@
#define LEC_HEADER_LEN 16 #define LEC_HEADER_LEN 16
struct lecdatahdr_8023 { struct lecdatahdr_8023 {
unsigned short le_header; unsigned short le_header;
unsigned char h_dest[ETH_ALEN]; unsigned char h_dest[ETH_ALEN];
unsigned char h_source[ETH_ALEN]; unsigned char h_source[ETH_ALEN];
unsigned short h_type; unsigned short h_type;
}; };
struct lecdatahdr_8025 { struct lecdatahdr_8025 {
unsigned short le_header; unsigned short le_header;
unsigned char ac_pad; unsigned char ac_pad;
unsigned char fc; unsigned char fc;
unsigned char h_dest[ETH_ALEN]; unsigned char h_dest[ETH_ALEN];
unsigned char h_source[ETH_ALEN]; unsigned char h_source[ETH_ALEN];
}; };
#define LEC_MINIMUM_8023_SIZE 62 #define LEC_MINIMUM_8023_SIZE 62
...@@ -44,17 +43,18 @@ struct lecdatahdr_8025 { ...@@ -44,17 +43,18 @@ struct lecdatahdr_8025 {
* *
*/ */
struct lane2_ops { struct lane2_ops {
int (*resolve)(struct net_device *dev, u8 *dst_mac, int force, int (*resolve) (struct net_device *dev, u8 *dst_mac, int force,
u8 **tlvs, u32 *sizeoftlvs); u8 **tlvs, u32 *sizeoftlvs);
int (*associate_req)(struct net_device *dev, u8 *lan_dst, int (*associate_req) (struct net_device *dev, u8 *lan_dst,
u8 *tlvs, u32 sizeoftlvs); u8 *tlvs, u32 sizeoftlvs);
void (*associate_indicator)(struct net_device *dev, u8 *mac_addr, void (*associate_indicator) (struct net_device *dev, u8 *mac_addr,
u8 *tlvs, u32 sizeoftlvs); u8 *tlvs, u32 sizeoftlvs);
}; };
/* /*
* 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,
...@@ -70,72 +70,88 @@ struct lane2_ops { ...@@ -70,72 +70,88 @@ struct lane2_ops {
#define LEC_ARP_TABLE_SIZE 16 #define LEC_ARP_TABLE_SIZE 16
struct lec_priv { struct lec_priv {
struct net_device_stats stats; struct net_device_stats stats;
unsigned short lecid; /* Lecid of this client */ unsigned short lecid; /* Lecid of this client */
struct lec_arp_table *lec_arp_empty_ones; struct lec_arp_table *lec_arp_empty_ones;
/* Used for storing VCC's that don't have a MAC address attached yet */ /* Used for storing VCC's that don't have a MAC address attached yet */
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
struct lec_arp_table *mcast_fwds; * one of them gets used.
/* With LANEv2 it is possible that BUS (or a special multicast server) */
establishes multiple Multicast Forward VCCs to us. This list struct lec_arp_table *mcast_fwds;
collects all those VCCs. LANEv1 client has only one item in this /*
list. These entries are not aged out. */ * With LANEv2 it is possible that BUS (or a special multicast server)
spinlock_t lec_arp_lock; * establishes multiple Multicast Forward VCCs to us. This list
struct atm_vcc *mcast_vcc; /* Default Multicast Send VCC */ * collects all those VCCs. LANEv1 client has only one item in this
struct atm_vcc *lecd; * list. These entries are not aged out.
struct timer_list lec_arp_timer; */
/* C10 */ spinlock_t lec_arp_lock;
unsigned int maximum_unknown_frame_count; struct atm_vcc *mcast_vcc; /* Default Multicast Send VCC */
/* Within the period of time defined by this variable, the client will send struct atm_vcc *lecd;
no more than C10 frames to BUS for a given unicast destination. (C11) */ struct timer_list lec_arp_timer; /* C10 */
unsigned long max_unknown_frame_time; unsigned int maximum_unknown_frame_count;
/* If no traffic has been sent in this vcc for this period of time, /*
vcc will be torn down (C12)*/ * Within the period of time defined by this variable, the client will send
unsigned long vcc_timeout_period; * no more than C10 frames to BUS for a given unicast destination. (C11)
/* An LE Client MUST not retry an LE_ARP_REQUEST for a */
given frame's LAN Destination more than maximum retry count times, unsigned long max_unknown_frame_time;
after the first LEC_ARP_REQUEST (C13)*/ /*
unsigned short max_retry_count; * If no traffic has been sent in this vcc for this period of time,
/* Max time the client will maintain an entry in its arp cache in * vcc will be torn down (C12)
absence of a verification of that relationship (C17)*/ */
unsigned long aging_time; unsigned long vcc_timeout_period;
/* Max time the client will maintain an entry in cache when /*
topology change flag is true (C18) */ * An LE Client MUST not retry an LE_ARP_REQUEST for a
unsigned long forward_delay_time; * given frame's LAN Destination more than maximum retry count times,
/* Topology change flag (C19)*/ * after the first LEC_ARP_REQUEST (C13)
int topology_change; */
/* Max time the client expects an LE_ARP_REQUEST/LE_ARP_RESPONSE unsigned short max_retry_count;
cycle to take (C20)*/ /*
unsigned long arp_response_time; * Max time the client will maintain an entry in its arp cache in
/* Time limit ot wait to receive an LE_FLUSH_RESPONSE after the * absence of a verification of that relationship (C17)
LE_FLUSH_REQUEST has been sent before taking recover action. (C21)*/ */
unsigned long flush_timeout; unsigned long aging_time;
/* The time since sending a frame to the bus after which the /*
LE Client may assume that the frame has been either discarded or * Max time the client will maintain an entry in cache when
delivered to the recipient (C22) */ * topology change flag is true (C18)
unsigned long path_switching_delay; */
unsigned long forward_delay_time; /* Topology change flag (C19) */
int topology_change;
/*
* Max time the client expects an LE_ARP_REQUEST/LE_ARP_RESPONSE
* cycle to take (C20)
*/
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)
*/
unsigned long flush_timeout;
/* The time since sending a frame to the bus after which the
* LE Client may assume that the frame has been either discarded or
* delivered to the recipient (C22)
*/
unsigned long path_switching_delay;
u8 *tlvs; /* LANE2: TLVs are new */ u8 *tlvs; /* LANE2: TLVs are new */
u32 sizeoftlvs; /* The size of the tlv array in bytes */ u32 sizeoftlvs; /* The size of the tlv array in bytes */
int lane_version; /* LANE2 */ int lane_version; /* LANE2 */
int itfnum; /* e.g. 2 for lec2, 5 for lec5 */ int itfnum; /* e.g. 2 for lec2, 5 for lec5 */
struct lane2_ops *lane2_ops; /* can be NULL for LANE v1 */ struct lane2_ops *lane2_ops; /* can be NULL for LANE v1 */
int is_proxy; /* bridge between ATM and Ethernet */ int is_proxy; /* bridge between ATM and Ethernet */
int is_trdev; /* Device type, 0 = Ethernet, 1 = TokenRing */ int is_trdev; /* Device type, 0 = Ethernet, 1 = TokenRing */
}; };
struct lec_vcc_priv { struct lec_vcc_priv {
void (*old_pop)(struct atm_vcc *vcc, struct sk_buff *skb); void (*old_pop) (struct atm_vcc *vcc, struct sk_buff *skb);
int xoff; int xoff;
}; };
#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_ */
net/atm/lec_arpc.h
View file @ 1c9d3e72
/* /*
* 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>
#include <linux/atmlec.h> #include <linux/atmlec.h>
struct lec_arp_table { struct lec_arp_table {
struct lec_arp_table *next; /* Linked entry list */ struct lec_arp_table *next; /* Linked entry list */
unsigned char atm_addr[ATM_ESA_LEN]; /* Atm address */ unsigned char atm_addr[ATM_ESA_LEN]; /* Atm address */
unsigned char mac_addr[ETH_ALEN]; /* Mac address */ unsigned char mac_addr[ETH_ALEN]; /* Mac address */
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);
/* Push that leads to daemon */
void (*old_recv_push)(struct atm_vcc *vcc, struct sk_buff *skb);
/* Push that leads to daemon */
void (*old_close)(struct atm_vcc *vcc);
/* We want to see when this
* vcc gets closed */
unsigned long last_used; /* For expiry */
unsigned long timestamp; /* Used for various timestamping
* things:
* 1. FLUSH started
* (status=ESI_FLUSH_PENDING)
* 2. Counting to
* max_unknown_frame_time
* (status=ESI_ARP_PENDING||
* status=ESI_VC_PENDING)
*/
unsigned char no_tries; /* No of times arp retry has been
tried */
unsigned char status; /* Status of this entry */
unsigned short flags; /* Flags for this entry */
unsigned short packets_flooded; /* Data packets flooded */
unsigned long flush_tran_id; /* Transaction id in flush protocol */
struct timer_list timer; /* Arping timer */
struct lec_priv *priv; /* Pointer back */
u8 *tlvs; /* LANE2: Each MAC address can have TLVs */ void (*old_push) (struct atm_vcc *vcc, struct sk_buff *skb);
u32 sizeoftlvs; /* associated with it. sizeoftlvs tells the */ /* Push that leads to daemon */
/* the length of the tlvs array */
struct sk_buff_head tx_wait; /* wait queue for outgoing packets */ void (*old_recv_push) (struct atm_vcc *vcc, struct sk_buff *skb);
/* Push that leads to daemon */
void (*old_close) (struct atm_vcc *vcc);
/* We want to see when this vcc gets closed */
unsigned long last_used; /* For expiry */
unsigned long timestamp; /* Used for various timestamping things:
* 1. FLUSH started
* (status=ESI_FLUSH_PENDING)
* 2. Counting to
* max_unknown_frame_time
* (status=ESI_ARP_PENDING||
* status=ESI_VC_PENDING)
*/
unsigned char no_tries; /* No of times arp retry has been tried */
unsigned char status; /* Status of this entry */
unsigned short flags; /* Flags for this entry */
unsigned short packets_flooded; /* Data packets flooded */
unsigned long flush_tran_id; /* Transaction id in flush protocol */
struct timer_list timer; /* Arping timer */
struct lec_priv *priv; /* Pointer back */
u8 *tlvs;
u32 sizeoftlvs; /*
* LANE2: Each MAC address can have TLVs
* associated with it. sizeoftlvs tells the
* the length of the tlvs array
*/
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
u32 type; * the tlvs in the lec_arp_table->tlvs array
u8 length; */
u8 value[255]; struct tlv {
u32 type;
u8 length;
u8 value[255];
}; };
/* Status fields */ /* Status fields */
#define ESI_UNKNOWN 0 /* #define ESI_UNKNOWN 0 /*
* Next packet sent to this mac address * Next packet sent to this mac address
* causes ARP-request to be sent * causes ARP-request to be sent
*/ */
#define ESI_ARP_PENDING 1 /* #define ESI_ARP_PENDING 1 /*
* There is no ATM address associated with this * There is no ATM address associated with this
* 48-bit address. The LE-ARP protocol is in * 48-bit address. The LE-ARP protocol is in
* progress. * progress.
*/ */
#define ESI_VC_PENDING 2 /* #define ESI_VC_PENDING 2 /*
* There is a valid ATM address associated with * There is a valid ATM address associated with
* this 48-bit address but there is no VC set * this 48-bit address but there is no VC set
* up to that ATM address. The signaling * up to that ATM address. The signaling
* protocol is in process. * protocol is in process.
*/ */
#define ESI_FLUSH_PENDING 4 /* #define ESI_FLUSH_PENDING 4 /*
* The LEC has been notified of the FLUSH_START * The LEC has been notified of the FLUSH_START
* status and it is assumed that the flush * status and it is assumed that the flush
* protocol is in process. * protocol is in process.
*/ */
#define ESI_FORWARD_DIRECT 5 /* #define ESI_FORWARD_DIRECT 5 /*
* Either the Path Switching Delay (C22) has * Either the Path Switching Delay (C22) has
* elapsed or the LEC has notified the Mapping * elapsed or the LEC has notified the Mapping
* that the flush protocol has completed. In * that the flush protocol has completed. In
* either case, it is safe to forward packets * either case, it is safe to forward packets
* to this address via the data direct VC. * to this address via the data direct VC.
*/ */
/* Flag values */ /* Flag values */
#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_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment