o ipx headers: Coding Style code reformatting

parent 1dbc2a79
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
#define IPX_NODE_LEN 6 #define IPX_NODE_LEN 6
#define IPX_MTU 576 #define IPX_MTU 576
struct sockaddr_ipx struct sockaddr_ipx {
{
sa_family_t sipx_family; sa_family_t sipx_family;
__u16 sipx_port; __u16 sipx_port;
__u32 sipx_network; __u32 sipx_network;
...@@ -16,9 +15,8 @@ struct sockaddr_ipx ...@@ -16,9 +15,8 @@ struct sockaddr_ipx
}; };
/* /*
* So we can fit the extra info for SIOCSIFADDR into the address nicely * So we can fit the extra info for SIOCSIFADDR into the address nicely
*/ */
#define sipx_special sipx_port #define sipx_special sipx_port
#define sipx_action sipx_zero #define sipx_action sipx_zero
#define IPX_DLTITF 0 #define IPX_DLTITF 0
...@@ -56,14 +54,13 @@ struct ipx_config_data { ...@@ -56,14 +54,13 @@ struct ipx_config_data {
* OLD Route Definition for backward compatibility. * OLD Route Definition for backward compatibility.
*/ */
struct ipx_route_def struct ipx_route_def {
{ __u32 ipx_network;
__u32 ipx_network; __u32 ipx_router_network;
__u32 ipx_router_network;
#define IPX_ROUTE_NO_ROUTER 0 #define IPX_ROUTE_NO_ROUTER 0
unsigned char ipx_router_node[IPX_NODE_LEN]; unsigned char ipx_router_node[IPX_NODE_LEN];
unsigned char ipx_device[16]; unsigned char ipx_device[16];
unsigned short ipx_flags; unsigned short ipx_flags;
#define IPX_RT_SNAP 8 #define IPX_RT_SNAP 8
#define IPX_RT_8022 4 #define IPX_RT_8022 4
#define IPX_RT_BLUEBOOK 2 #define IPX_RT_BLUEBOOK 2
...@@ -71,7 +68,7 @@ struct ipx_route_def ...@@ -71,7 +68,7 @@ struct ipx_route_def
}; };
#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE) #define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)
#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE+1) #define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)
#define SIOCIPXCFGDATA (SIOCPROTOPRIVATE+2) #define SIOCIPXCFGDATA (SIOCPROTOPRIVATE + 2)
#define SIOCIPXNCPCONN (SIOCPROTOPRIVATE+3) #define SIOCIPXNCPCONN (SIOCPROTOPRIVATE + 3)
#endif /* def _IPX_H_ */ #endif /* _IPX_H_ */
...@@ -25,11 +25,11 @@ struct ipx_address { ...@@ -25,11 +25,11 @@ struct ipx_address {
#define IPX_MAX_PPROP_HOPS 8 #define IPX_MAX_PPROP_HOPS 8
struct ipxhdr { struct ipxhdr {
__u16 ipx_checksum __attribute__ ((packed)); __u16 ipx_checksum __attribute__ ((packed));
#define IPX_NO_CHECKSUM 0xFFFF #define IPX_NO_CHECKSUM 0xFFFF
__u16 ipx_pktsize __attribute__ ((packed)); __u16 ipx_pktsize __attribute__ ((packed));
__u8 ipx_tctrl; __u8 ipx_tctrl;
__u8 ipx_type; __u8 ipx_type;
#define IPX_TYPE_UNKNOWN 0x00 #define IPX_TYPE_UNKNOWN 0x00
#define IPX_TYPE_RIP 0x01 /* may also be 0 */ #define IPX_TYPE_RIP 0x01 /* may also be 0 */
#define IPX_TYPE_SAP 0x04 /* may also be 0 */ #define IPX_TYPE_SAP 0x04 /* may also be 0 */
...@@ -47,42 +47,42 @@ static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb) ...@@ -47,42 +47,42 @@ static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb)
struct ipx_interface { struct ipx_interface {
/* IPX address */ /* IPX address */
__u32 if_netnum; __u32 if_netnum;
unsigned char if_node[IPX_NODE_LEN]; unsigned char if_node[IPX_NODE_LEN];
atomic_t refcnt; atomic_t refcnt;
/* physical device info */ /* physical device info */
struct net_device *if_dev; struct net_device *if_dev;
struct datalink_proto *if_dlink; struct datalink_proto *if_dlink;
unsigned short if_dlink_type; unsigned short if_dlink_type;
/* socket support */ /* socket support */
unsigned short if_sknum; unsigned short if_sknum;
struct sock *if_sklist; struct sock *if_sklist;
spinlock_t if_sklist_lock; spinlock_t if_sklist_lock;
/* administrative overhead */ /* administrative overhead */
int if_ipx_offset; int if_ipx_offset;
unsigned char if_internal; unsigned char if_internal;
unsigned char if_primary; unsigned char if_primary;
struct ipx_interface *if_next; struct ipx_interface *if_next;
}; };
struct ipx_route { struct ipx_route {
__u32 ir_net; __u32 ir_net;
struct ipx_interface *ir_intrfc; struct ipx_interface *ir_intrfc;
unsigned char ir_routed; unsigned char ir_routed;
unsigned char ir_router_node[IPX_NODE_LEN]; unsigned char ir_router_node[IPX_NODE_LEN];
struct ipx_route *ir_next; struct ipx_route *ir_next;
atomic_t refcnt; atomic_t refcnt;
}; };
#ifdef __KERNEL__ #ifdef __KERNEL__
struct ipx_cb { struct ipx_cb {
u8 ipx_tctrl; u8 ipx_tctrl;
u32 ipx_dest_net; u32 ipx_dest_net;
u32 ipx_source_net; u32 ipx_source_net;
struct { struct {
u32 netnum; u32 netnum;
int index; int index;
...@@ -92,14 +92,16 @@ struct ipx_cb { ...@@ -92,14 +92,16 @@ struct ipx_cb {
struct ipx_opt { struct ipx_opt {
struct ipx_address dest_addr; struct ipx_address dest_addr;
struct ipx_interface *intrfc; struct ipx_interface *intrfc;
unsigned short port; unsigned short port;
#ifdef CONFIG_IPX_INTERN #ifdef CONFIG_IPX_INTERN
unsigned char node[IPX_NODE_LEN]; unsigned char node[IPX_NODE_LEN];
#endif #endif
unsigned short type; unsigned short type;
/* To handle special ncp connection-handling sockets for mars_nwe, /*
* the connection number must be stored in the socket. */ * To handle special ncp connection-handling sockets for mars_nwe,
unsigned short ipx_ncp_conn; * the connection number must be stored in the socket.
*/
unsigned short ipx_ncp_conn;
}; };
#define ipx_sk(__sk) ((struct ipx_opt *)(__sk)->protinfo) #define ipx_sk(__sk) ((struct ipx_opt *)(__sk)->protinfo)
...@@ -121,4 +123,4 @@ extern void ipx_proc_exit(void); ...@@ -121,4 +123,4 @@ extern void ipx_proc_exit(void);
extern const char *ipx_frame_name(unsigned short); extern const char *ipx_frame_name(unsigned short);
extern const char *ipx_device_name(struct ipx_interface *intrfc); extern const char *ipx_device_name(struct ipx_interface *intrfc);
#endif /* def _NET_INET_IPX_H_ */ #endif /* _NET_INET_IPX_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