Standardized spacing is easier to read.
Showing the changes to include/uapi (1 of 1 file). Show all
Unified · Split
| @@ -19,7 +19,6 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/types.h> |
| 20 | 20 | #include <linux/if_ether.h> |
| 21 | 21 | |
| 22 | − | |
| 23 | 22 | /* |
| 24 | 23 | * These are the defined ARCnet Protocol ID's. |
| 25 | 24 | */ |
| @@ -57,42 +56,40 @@ · 31 unmodified lines | ||
| 57 | 56 | * The RFC1201-specific components of an arcnet packet header. |
| 58 | 57 | */ |
| 59 | 58 | struct arc_rfc1201 { |
| 60 | − __u8 proto; /* protocol ID field - varies */ | |
| 61 | − __u8 split_flag; /* for use with split packets */ | |
| 62 | − __be16 sequence; /* sequence number */ | |
| 63 | − __u8 payload[0]; /* space remaining in packet (504 bytes)*/ | |
| 59 | + __u8 proto; /* protocol ID field - varies */ | |
| 60 | + __u8 split_flag; /* for use with split packets */ | |
| 61 | + __be16 sequence; /* sequence number */ | |
| 62 | + __u8 payload[0]; /* space remaining in packet (504 bytes)*/ | |
| 64 | 63 | }; |
| 65 | 64 | #define RFC1201_HDR_SIZE 4 |
| 66 | 65 | |
| 67 | − | |
| 68 | 66 | /* |
| 69 | 67 | * The RFC1051-specific components. |
| 70 | 68 | */ |
| 71 | 69 | struct arc_rfc1051 { |
| 72 | − __u8 proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */ | |
| 73 | − __u8 payload[0]; /* 507 bytes */ | |
| 70 | + __u8 proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */ | |
| 71 | + __u8 payload[0]; /* 507 bytes */ | |
| 74 | 72 | }; |
| 75 | 73 | #define RFC1051_HDR_SIZE 1 |
| 76 | 74 | |
| 77 | − | |
| 78 | 75 | /* |
| 79 | 76 | * The ethernet-encap-specific components. We have a real ethernet header |
| 80 | 77 | * and some data. |
| 81 | 78 | */ |
| 82 | 79 | struct arc_eth_encap { |
| 83 | − __u8 proto; /* Always ARC_P_ETHER */ | |
| 84 | − struct ethhdr eth; /* standard ethernet header (yuck!) */ | |
| 85 | − __u8 payload[0]; /* 493 bytes */ | |
| 80 | + __u8 proto; /* Always ARC_P_ETHER */ | |
| 81 | + struct ethhdr eth; /* standard ethernet header (yuck!) */ | |
| 82 | + __u8 payload[0]; /* 493 bytes */ | |
| 86 | 83 | }; |
| 87 | 84 | #define ETH_ENCAP_HDR_SIZE 14 |
| 88 | 85 | |
| 89 | − | |
| 90 | 86 | struct arc_cap { |
| 91 | 87 | __u8 proto; |
| 92 | − __u8 cookie[sizeof(int)]; /* Actually NOT sent over the network */ | |
| 88 | + __u8 cookie[sizeof(int)]; | |
| 89 | + /* Actually NOT sent over the network */ | |
| 93 | 90 | union { |
| 94 | 91 | __u8 ack; |
| 95 | − __u8 raw[0]; /* 507 bytes */ | |
| 92 | + __u8 raw[0]; /* 507 bytes */ | |
| 96 | 93 | } mes; |
| 97 | 94 | }; |
| 98 | 95 | |
| @@ -105,9 +102,9 @@ struct arc_cap { · 6 unmodified lines | ||
| 105 | 102 | * driver. |
| 106 | 103 | */ |
| 107 | 104 | struct arc_hardware { |
| 108 | − __u8 source, /* source ARCnet - filled in automagically */ | |
| 109 | − dest, /* destination ARCnet - 0 for broadcast */ | |
| 110 | − offset[2]; /* offset bytes (some weird semantics) */ | |
| 105 | + __u8 source; /* source ARCnet - filled in automagically */ | |
| 106 | + __u8 dest; /* destination ARCnet - 0 for broadcast */ | |
| 107 | + __u8 offset[2]; /* offset bytes (some weird semantics) */ | |
| 111 | 108 | }; |
| 112 | 109 | #define ARC_HDR_SIZE 4 |
| 113 | 110 | |
| @@ -116,17 +113,17 @@ struct arc_hardware { · 2 unmodified lines | ||
| 116 | 113 | * when you do a raw packet capture). |
| 117 | 114 | */ |
| 118 | 115 | struct archdr { |
| 119 | − /* hardware requirements */ | |
| 120 | − struct arc_hardware hard; | |
| 121 | − | |
| 122 | − /* arcnet encapsulation-specific bits */ | |
| 123 | − union { | |
| 124 | − struct arc_rfc1201 rfc1201; | |
| 125 | − struct arc_rfc1051 rfc1051; | |
| 126 | − struct arc_eth_encap eth_encap; | |
| 127 | − struct arc_cap cap; | |
| 128 | − __u8 raw[0]; /* 508 bytes */ | |
| 129 | − } soft; | |
| 116 | + /* hardware requirements */ | |
| 117 | + struct arc_hardware hard; | |
| 118 | + | |
| 119 | + /* arcnet encapsulation-specific bits */ | |
| 120 | + union { | |
| 121 | + struct arc_rfc1201 rfc1201; | |
| 122 | + struct arc_rfc1051 rfc1051; | |
| 123 | + struct arc_eth_encap eth_encap; | |
| 124 | + struct arc_cap cap; | |
| 125 | + __u8 raw[0]; /* 508 bytes */ | |
| 126 | + } soft; | |
| 130 | 127 | }; |
| 131 | 128 | |
| 132 | 129 | #endif /* _LINUX_IF_ARCNET_H */ |