RSTP testing - PATCH: BPDU length calculation

   The bpdu_len sent to STP_OUT_tx_bpdu() excludes the ethernet and
   and LLC headers, though the bpdu pointer points to the start of the
   ethernet header. Given the types in rstplib/stp_bpdu.h, we need to
   be sending a packet with (base, len) given by
   (bpdu, bpdu_len + sizeof(MAC_HEADER_T) + sizeof(ETH_HEADER_T))
   MAC_HEADER_T is dest and source ethernet addresses and ETH_HEADER_T
   is the 802.2 part.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

diff --git a/bridge_track.c b/bridge_track.c
index 67f6252a1bebc51102efa67be49570bf118adbe9..da53d9bd8b75127ef466419f91335a01e2a13dff 100644 (file)
--- a/bridge_track.c
+++ b/bridge_track.c
@@ -763,8 +763,7 @@ STP_OUT_tx_bpdu(IN int port_index, IN int vlan_id,
        TST(vlan_id == 0, 0);
 
        packet_send(port->if_index, bpdu,
-                   bpdu_len + sizeof(ETH_HEADER_T)
-                   + sizeof(BPDU_HEADER_T) + sizeof(BPDU_BODY_T));
+                   bpdu_len + sizeof(MAC_HEADER_T) + sizeof(ETH_HEADER_T));
        return 0;
 }