summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b0c397e)
raw | patch | inline | side by side (parent: b0c397e)
author | Aravind Batni <aravindbr@ti.com> | |
Thu, 7 May 2015 20:01:18 +0000 (16:01 -0400) | ||
committer | Aravind Batni <aravindbr@ti.com> | |
Thu, 7 May 2015 20:01:18 +0000 (16:01 -0400) |
diff --git a/fw/v0/classify1_1.bib b/fw/v0/classify1_1.bib
index fe495fd5783c772d28994161204186d9041184c8..867e4330a4ddf43038660fe1069ae433e6bd86d5 100644 (file)
Binary files a/fw/v0/classify1_1.bib and b/fw/v0/classify1_1.bib differ
Binary files a/fw/v0/classify1_1.bib and b/fw/v0/classify1_1.bib differ
index 49e20898499fbaff715e5221d6695374f3ffef18..8204fafb9b10c76745045ff724386bbb64af3846 100644 (file)
--- a/fw/v0/classify1_1_bin.c
+++ b/fw/v0/classify1_1_bin.c
0x2f000384,
0x01049696,
0x240000c4,
- 0xc90fc603,
- 0x24000004,
+ 0xc90fc602,
0x240004c4,
0x108686ee,
0x2f02818e,
0x24000231,
0x2f028051,
0xc90dc602,
- 0x010480c4,
+ 0x0104c4c4,
0xc90cc602,
- 0x010480c4,
+ 0x0104c4c4,
0x2f000384,
+ 0x00c49696,
0x24080080,
0x68808603,
0x24000303,
diff --git a/fw/v0/classify1_2.bib b/fw/v0/classify1_2.bib
index 6932a3a5db7b984056a8ee1bb38b493351f058ca..7f58f151e049ee5f234d7aebc434bdf9b5892bea 100644 (file)
Binary files a/fw/v0/classify1_2.bib and b/fw/v0/classify1_2.bib differ
Binary files a/fw/v0/classify1_2.bib and b/fw/v0/classify1_2.bib differ
index b7b99b351ecacfc44c361964f8f09c1518451633..e35997c4886d6822c9b99100b7d000f4dbe24a9c 100644 (file)
--- a/fw/v0/classify1_2_bin.c
+++ b/fw/v0/classify1_2_bin.c
0x2f000384,
0x01049696,
0x240000c4,
- 0xc90fc603,
- 0x24000004,
+ 0xc90fc602,
0x240004c4,
0x108686ee,
0x2f02818e,
0x24000231,
0x2f028051,
0xc90dc602,
- 0x010480c4,
+ 0x0104c4c4,
0xc90cc602,
- 0x010480c4,
+ 0x0104c4c4,
0x2f000384,
+ 0x00c49696,
0x24080080,
0x68808603,
0x24000303,
diff --git a/fw/v0/parse1.p b/fw/v0/parse1.p
index 34341e69083f2af61a3a864a5b53519ba8435023..2b51b7a60121760b95ecb3eb0d567567fd713a9d 100644 (file)
--- a/fw/v0/parse1.p
+++ b/fw/v0/parse1.p
sub s_cdeCmdChk.byteLen, s_pktCxt.endOffset, s_pktCxt.startOffset\r
mov s_cdeCmdChk.operation, CDE_CMD_CHECKSUM2_VALIDATE\r
xout XID_CDECTRL, s_cdeCmdChk, SIZE(s_cdeCmdChk)\r
-#endif\r
- mov s_cdeCmdWd.operation, CDE_CMD_WINDOW_ADVANCE\r
- mov s_cdeCmdWd.byteCount, GRE_SIZE_CHKSUM_BYTES\r
+ mov s_cdeCmdWd.operation, CDE_CMD_WINDOW_ADVANCE \r
+ #endif\r
+ mov s_cdeCmdWd.byteCount, GRE_SIZE_CHKSUM_BYTES\r
\r
// Load the GRE ethertype value into the LUT SPI field\r
l_c1ParseGre0:\r
\r
// mov s_cdeCmdWd.byteCount, 0\r
qbbc l_c1ParseGre1, s_greHdr.flags.t_GreKBit\r
- add s_cdeCmdWd.byteCount, r0.w0, GRE_SIZE_KEY_BYTES\r
+ add s_cdeCmdWd.byteCount, s_cdeCmdWd.byteCount, GRE_SIZE_KEY_BYTES\r
\r
l_c1ParseGre1:\r
qbbc l_c1ParseGre2, s_greHdr.flags.t_GreSBit\r
- add s_cdeCmdWd.byteCount, r0.w0, GRE_SIZE_SEQNUM_BYTES\r
+ add s_cdeCmdWd.byteCount, s_cdeCmdWd.byteCount, GRE_SIZE_SEQNUM_BYTES\r
\r
l_c1ParseGre2:\r
// scroll past the optional key and sequence number fields\r
// a scroll of 0 should be ok\r
xout XID_CDECTRL, s_cdeCmdWd, SIZE(s_cdeCmdWd)\r
+ add s_pktCxt.startOffset, s_pktCxt.startOffset, s_cdeCmdWd.byteCount \r
\r
mov r0.w0, ETH_TYPE_IP\r
qbne l_c1ParseGre3, s_greHdr.proto, r0.w0 \r
index cea74a86b03b21d58e61722e7e87da6e626b0ed7..d2a3295226366b65d5b7cfcb4f3393c1af4e4e9a 100644 (file)
0xa6, 0x66, 0x57, 0x04, 0x08, 0x00, 0x45, 0x00,\r
0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x05, 0x2f,\r
0x43, 0x0c, 0x6e, 0x6f, 0x70, 0x71, 0xc8, 0xc9,\r
- 0xca, 0xcb, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\r
- 0x00, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x05, 0x11,\r
- 0x43, 0x0c, 0x6e, 0x6f, 0x70, 0x71, 0xc8, 0xc9,\r
- 0xca, 0xcb, 0x12, 0x34, 0x05, 0x55, 0x00, 0x58,\r
- 0xc0, 0x0b, 0x2d, 0xcf, 0x46, 0x29, 0x04, 0xb4,\r
- 0x78, 0xd8, 0x68, 0xa7, 0xff, 0x3f, 0x2b, 0xf1,\r
- 0xfc, 0xd9, 0x7a, 0x96, 0x09, 0x2c, 0xa5, 0x57,\r
- 0x74, 0x64, 0xc4, 0xaf, 0x15, 0x28, 0xa4, 0xe9,\r
- 0x57, 0xdb, 0x5e, 0x20, 0xfb, 0x38, 0xa8, 0x4e,\r
- 0xa6, 0x14, 0x93, 0x25, 0x56, 0x24, 0x44, 0xdf,\r
- 0x59, 0x8d, 0x43, 0x7b, 0xbe, 0x90, 0x16, 0x89,\r
- 0x9d, 0x7e, 0x77, 0xc6, 0x2f, 0x26, 0x98, 0x88,\r
- 0xf5, 0xb4, 0x30, 0xd4, 0x34, 0x9d, 0x3a, 0x0d,\r
- 0x0f, 0xbd, 0x2f, 0xa1, 0xf7, 0x0f, 0xd9, 0x68,\r
- 0xf4, 0xd9 };\r
+ 0xca, 0xcb, 0xB0, 0x00, 0x08, 0x00, 0x00, 0x00, \r
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \r
+ 0x00, 0x01, 0x45, 0x00, 0x00, 0x6c, 0x00, 0x00, \r
+ 0x00, 0x00, 0x05, 0x11, 0x43, 0x0c, 0x6e, 0x6f, \r
+ 0x70, 0x71, 0xc8, 0xc9, 0xca, 0xcb, 0x12, 0x34, \r
+ 0x05, 0x55, 0x00, 0x58, 0xc0, 0x0b, 0x2d, 0xcf, \r
+ 0x46, 0x29, 0x04, 0xb4, 0x78, 0xd8, 0x68, 0xa7, \r
+ 0xff, 0x3f, 0x2b, 0xf1, 0xfc, 0xd9, 0x7a, 0x96, \r
+ 0x09, 0x2c, 0xa5, 0x57, 0x74, 0x64, 0xc4, 0xaf, \r
+ 0x15, 0x28, 0xa4, 0xe9, 0x57, 0xdb, 0x5e, 0x20, \r
+ 0xfb, 0x38, 0xa8, 0x4e, 0xa6, 0x14, 0x93, 0x25, \r
+ 0x56, 0x24, 0x44, 0xdf, 0x59, 0x8d, 0x43, 0x7b, \r
+ 0xbe, 0x90, 0x16, 0x89, 0x9d, 0x7e, 0x77, 0xc6, \r
+ 0x2f, 0x26, 0x98, 0x88, 0xf5, 0xb4, 0x30, 0xd4, \r
+ 0x34, 0x9d, 0x3a, 0x0d, 0x0f, 0xbd, 0x2f, 0xa1, \r
+ 0xf7, 0x0f, 0xd9, 0x68, 0xf4, 0xd9 \r
+};\r
\r
\r
#pragma DATA_SECTION (pkt17Info, ".testPkts")\r
#ifdef NSS_GEN2\r
static pasahoLongInfo_t pkt17Info = {\r
- TF_FORM_PKT_INFO_WORD0(0,24,1,0,38), /* cmd len = 24, pmatch = 1, frag = 0, start offset = 38 (Inner IP Header) */\r
+ TF_FORM_PKT_INFO_WORD0(0,24,1,0,50), /* cmd len = 24, pmatch = 1, frag = 0, start offset = 50 (Inner IP Header) */\r
TF_FORM_PKT_INFO_WORD1(146,0,0,PASAHO_HDR_IPv4), /* end offset = 106, errIdx, portNum = 0, nextHdr = IPv4 */\r
TF_FORM_PKT_INFO_WORD2(14,0,0,0), /* L3 offset = 14 */\r
TF_FORM_PKT_INFO_WORD3((PASAHO_HDR_BITMASK_MAC | PASAHO_HDR_BITMASK_IPv4),\r
#else\r
static pasahoLongInfo_t pkt17Info = {\r
\r
- TF_FORM_PKT_INFO_WORD0(0,24,38), /* cmd len = 24, start offset = 38 (Inner IP Header) */\r
+ TF_FORM_PKT_INFO_WORD0(0,24,50), /* cmd len = 24, start offset = 50 (Inner IP Header) */\r
TF_FORM_PKT_INFO_WORD1(146,0,1,0,0,0), /* end offset = 146 */\r
TF_FORM_PKT_INFO_WORD2(14,0,0,0), /* L3 offset = 14, l4Offset = 0, l5Offset = 0, ahEspOffset = 0 */\r
\r