F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
John Abraham
2012-05-26 10:39:44 -04:00
parent adbd1ca033 fc20a3f81c
commit 219853cb5d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/models/Makefile
View File

@@ -101,7 +101,6 @@ SOURCEFIGS = \
$(SRC)/lte/doc/source/figures/lte-epc-e2e-data-protocol-stack.dia \
$(SRC)/lte/doc/source/figures/MCS_2_test.eps \
$(SRC)/lte/doc/source/figures/MCS_12_test.eps \
$(SRC)/lte/doc/source/figures/MCS_14_test.eps \
$(SRC)/lte/doc/source/figures/lena-dual-stripe.eps \
$(SRC)/lte/doc/source/figures/lte-mcs-index.eps \
$(SRC)/lte/doc/source/figures/lenaThrTestCase1.eps \
@@ -136,8 +135,6 @@ SOURCEFIGS = \
$(SRC)/lte/doc/source/figures/MCS_17_20.png \
$(SRC)/lte/doc/source/figures/MCS_21_24.pdf \
$(SRC)/lte/doc/source/figures/MCS_21_24.png \
$(SRC)/lte/doc/source/figures/MCS_25_27.pdf \
$(SRC)/lte/doc/source/figures/MCS_25_27.png \
$(SRC)/lte/doc/source/figures/lte-phy-interference.png \
$(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \
$(SRC)/lte/doc/source/figures/helpers.png \
@@ -201,7 +198,6 @@ IMAGES_EPS = \
$(FIGURES)/lte-epc-e2e-data-protocol-stack.eps \
$(FIGURES)/MCS_2_test.eps \
$(FIGURES)/MCS_12_test.eps \
$(FIGURES)/MCS_14_test.eps \
$(FIGURES)/lena-dual-stripe.eps \
$(FIGURES)/lte-mcs-index.eps \
$(FIGURES)/lenaThrTestCase1.eps \

9
src/internet/model/arp-header.cc
View File

@@ -121,8 +121,13 @@ ArpHeader::Print (std::ostream &os) const
uint32_t
ArpHeader::GetSerializedSize (void) const
{
/* this is the size of an ARP payload. */
return 28;
NS_ASSERT((m_macSource.GetLength () == 6) || (m_macSource.GetLength () == 8));
NS_ASSERT (m_macSource.GetLength () == m_macDest.GetLength ());
uint32_t length = 16; // Length minus two hardware addresses
length += m_macSource.GetLength () * 2;
return length;
}
void