diff options
Diffstat (limited to 'drivers/net/bonding/bond_3ad.h')
-rw-r--r-- | drivers/net/bonding/bond_3ad.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index 862952fa6fd9..f16557264944 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h | |||
@@ -92,7 +92,7 @@ typedef enum { | |||
92 | typedef enum { | 92 | typedef enum { |
93 | AD_MARKER_INFORMATION_SUBTYPE = 1, // marker imformation subtype | 93 | AD_MARKER_INFORMATION_SUBTYPE = 1, // marker imformation subtype |
94 | AD_MARKER_RESPONSE_SUBTYPE // marker response subtype | 94 | AD_MARKER_RESPONSE_SUBTYPE // marker response subtype |
95 | } marker_subtype_t; | 95 | } bond_marker_subtype_t; |
96 | 96 | ||
97 | // timers types(43.4.9 in the 802.3ad standard) | 97 | // timers types(43.4.9 in the 802.3ad standard) |
98 | typedef enum { | 98 | typedef enum { |
@@ -148,7 +148,7 @@ typedef struct lacpdu_header { | |||
148 | } lacpdu_header_t; | 148 | } lacpdu_header_t; |
149 | 149 | ||
150 | // Marker Protocol Data Unit(PDU) structure(43.5.3.2 in the 802.3ad standard) | 150 | // Marker Protocol Data Unit(PDU) structure(43.5.3.2 in the 802.3ad standard) |
151 | typedef struct marker { | 151 | typedef struct bond_marker { |
152 | u8 subtype; // = 0x02 (marker PDU) | 152 | u8 subtype; // = 0x02 (marker PDU) |
153 | u8 version_number; // = 0x01 | 153 | u8 version_number; // = 0x01 |
154 | u8 tlv_type; // = 0x01 (marker information) | 154 | u8 tlv_type; // = 0x01 (marker information) |
@@ -161,12 +161,12 @@ typedef struct marker { | |||
161 | u8 tlv_type_terminator; // = 0x00 | 161 | u8 tlv_type_terminator; // = 0x00 |
162 | u8 terminator_length; // = 0x00 | 162 | u8 terminator_length; // = 0x00 |
163 | u8 reserved_90[90]; // = 0 | 163 | u8 reserved_90[90]; // = 0 |
164 | } marker_t; | 164 | } bond_marker_t; |
165 | 165 | ||
166 | typedef struct marker_header { | 166 | typedef struct bond_marker_header { |
167 | struct ad_header ad_header; | 167 | struct ad_header ad_header; |
168 | struct marker marker; | 168 | struct bond_marker marker; |
169 | } marker_header_t; | 169 | } bond_marker_header_t; |
170 | 170 | ||
171 | #pragma pack() | 171 | #pragma pack() |
172 | 172 | ||