Merge pull request #1229 from tony-josi-aws/fix_zynq_packet_filtering_wrt_endianness

tony-josi-aws · web-flow · commit 0ab46d1b01ae · 2025-02-28T11:18:56.000+05:30
Fix Zynq network interface incoming packet filtering by correcting endianness
diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif_dma.c b/source/portable/NetworkInterface/Zynq/x_emacpsif_dma.c
@@ -439,7 +439,7 @@ BaseType_t xMayAcceptPacket( uint8_t * pucEthernetBuffer )
 
         /* Ensure that the incoming packet is not fragmented (only outgoing packets
          * can be fragmented) as these are the only handled IP frames currently. */
-        if( ( pxIPHeader->usFragmentOffset & FreeRTOS_ntohs( ipFRAGMENT_OFFSET_BIT_MASK ) ) != 0U )
+        if( ( pxIPHeader->usFragmentOffset & ipFRAGMENT_OFFSET_BIT_MASK ) != 0U )
         {
             return pdFALSE;
         }
diff --git a/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c b/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c
@@ -405,7 +405,7 @@ BaseType_t xMayAcceptPacket( uint8_t * pucEthernetBuffer )
 
         /* Ensure that the incoming packet is not fragmented (only outgoing packets
          * can be fragmented) as these are the only handled IP frames currently. */
-        if( ( pxIPHeader->usFragmentOffset & FreeRTOS_ntohs( ipFRAGMENT_OFFSET_BIT_MASK ) ) != 0U )
+        if( ( pxIPHeader->usFragmentOffset & ipFRAGMENT_OFFSET_BIT_MASK ) != 0U )
         {
             return pdFALSE;
         }

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ BaseType_t xMayAcceptPacket( uint8_t * pucEthernetBuffer )`
`439`	`439`
`440`	`440`	`/* Ensure that the incoming packet is not fragmented (only outgoing packets`
`441`	`441`	`* can be fragmented) as these are the only handled IP frames currently. */`
`442`		`- if( ( pxIPHeader->usFragmentOffset & FreeRTOS_ntohs( ipFRAGMENT_OFFSET_BIT_MASK ) ) != 0U )`
	`442`	`+ if( ( pxIPHeader->usFragmentOffset & ipFRAGMENT_OFFSET_BIT_MASK ) != 0U )`
`443`	`443`	`{`
`444`	`444`	`return pdFALSE;`
`445`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ BaseType_t xMayAcceptPacket( uint8_t * pucEthernetBuffer )`
`405`	`405`
`406`	`406`	`/* Ensure that the incoming packet is not fragmented (only outgoing packets`
`407`	`407`	`* can be fragmented) as these are the only handled IP frames currently. */`
`408`		`- if( ( pxIPHeader->usFragmentOffset & FreeRTOS_ntohs( ipFRAGMENT_OFFSET_BIT_MASK ) ) != 0U )`
	`408`	`+ if( ( pxIPHeader->usFragmentOffset & ipFRAGMENT_OFFSET_BIT_MASK ) != 0U )`
`409`	`409`	`{`
`410`	`410`	`return pdFALSE;`
`411`	`411`	`}`