From e727149e26b08550269a7786fda977aed65578f6 Mon Sep 17 00:00:00 2001 From: Holger Eitzenberger Date: Fri, 26 Dec 2008 13:41:53 -0800 Subject: 802.3ad: use standard ethhdr instead of ad_header 802.3ad has its own ethhdr-like structure in the form of an ad_header, which is at the start of both the LACPDU and marker PDU. Both are the same from the struct values, both are packed as well. It's therefore perfectly fine to replace the ad_header by the ethhdr and to remove its definition. Signed-off-by: Holger Eitzenberger Signed-off-by: David S. Miller --- drivers/net/bonding/bond_3ad.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'drivers/net/bonding/bond_3ad.h') diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index 3aab1c2b3f00..8a83eb283c21 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h @@ -105,12 +105,6 @@ typedef enum { #pragma pack(1) -typedef struct ad_header { - struct mac_addr destination_address; - struct mac_addr source_address; - __be16 length_type; -} ad_header_t; - // Link Aggregation Control Protocol(LACP) data unit structure(43.4.2.2 in the 802.3ad standard) typedef struct lacpdu { u8 subtype; // = LACP(= 0x01) @@ -143,7 +137,7 @@ typedef struct lacpdu { } lacpdu_t; typedef struct lacpdu_header { - struct ad_header ad_header; + struct ethhdr hdr; struct lacpdu lacpdu; } lacpdu_header_t; @@ -164,7 +158,7 @@ typedef struct bond_marker { } bond_marker_t; typedef struct bond_marker_header { - struct ad_header ad_header; + struct ethhdr hdr; struct bond_marker marker; } bond_marker_header_t; -- cgit v1.2.3-59-g8ed1b