Merge pull request #3 from bjsowa/dev-stm32-rx-fix

HTRamsey · web-flow · commit d8d3f96dce11 · 2023-08-31T11:01:39.000-04:00
Fill Interface and EndPoint fields for all Rx Network buffers
diff --git a/source/portable/NetworkInterface/STM32/NetworkInterface.c b/source/portable/NetworkInterface/STM32/NetworkInterface.c
@@ -543,6 +543,8 @@ static UBaseType_t prvNetworkInterfaceInput( void )
     {
         /*configASSERT( xEthHandle.RxDescList.RxDataLength <= EMAC_DATA_BUFFER_SIZE );*/
         xResult++;
+        pxCurDescriptor->pxInterface = pxMyInterface;
+        pxCurDescriptor->pxEndPoint = FreeRTOS_MatchingEndpoint( pxMyInterface, pxCurDescriptor->pucEthernetBuffer );;
         #if ( ipconfigUSE_LINKED_RX_MESSAGES != 0 )
             if ( pxStartDescriptor == NULL )
             {
@@ -559,7 +561,7 @@ static UBaseType_t prvNetworkInterfaceInput( void )
             {
                 iptraceETHERNET_RX_EVENT_LOST();
                 FreeRTOS_debug_printf( ( "prvNetworkInterfaceInput: xSendEventStructToIPTask failed\n" ) );
-                vReleaseNetworkBufferAndDescriptor( pxStartDescriptor );
+                vReleaseNetworkBufferAndDescriptor( pxCurDescriptor );
             }
         #endif
     }
@@ -568,8 +570,6 @@ static UBaseType_t prvNetworkInterfaceInput( void )
     #if ( ipconfigUSE_LINKED_RX_MESSAGES != 0 )
         if( xResult > 0 )
         {
-            pxStartDescriptor->pxInterface = pxMyInterface;
-            pxStartDescriptor->pxEndPoint = FreeRTOS_MatchingEndpoint( pxMyInterface, pxStartDescriptor->pucEthernetBuffer );
             xRxEvent.pvData = ( void * ) pxStartDescriptor;
             if( xSendEventStructToIPTask( &xRxEvent, ( TickType_t ) 100U ) != pdPASS )
             {

Original file line number	Diff line number	Diff line change
`@@ -543,6 +543,8 @@ static UBaseType_t prvNetworkInterfaceInput( void )`
`543`	`543`	`{`
`544`	`544`	`/configASSERT( xEthHandle.RxDescList.RxDataLength <= EMAC_DATA_BUFFER_SIZE );/`
`545`	`545`	`xResult++;`
	`546`	`+ pxCurDescriptor->pxInterface = pxMyInterface;`
	`547`	`+ pxCurDescriptor->pxEndPoint = FreeRTOS_MatchingEndpoint( pxMyInterface, pxCurDescriptor->pucEthernetBuffer );;`
`546`	`548`	`#if ( ipconfigUSE_LINKED_RX_MESSAGES != 0 )`
`547`	`549`	`if ( pxStartDescriptor == NULL )`
`548`	`550`	`{`
`@@ -559,7 +561,7 @@ static UBaseType_t prvNetworkInterfaceInput( void )`
`559`	`561`	`{`
`560`	`562`	`iptraceETHERNET_RX_EVENT_LOST();`
`561`	`563`	`FreeRTOS_debug_printf( ( "prvNetworkInterfaceInput: xSendEventStructToIPTask failed\n" ) );`
`562`		`- vReleaseNetworkBufferAndDescriptor( pxStartDescriptor );`
	`564`	`+ vReleaseNetworkBufferAndDescriptor( pxCurDescriptor );`
`563`	`565`	`}`
`564`	`566`	`#endif`
`565`	`567`	`}`
`@@ -568,8 +570,6 @@ static UBaseType_t prvNetworkInterfaceInput( void )`
`568`	`570`	`#if ( ipconfigUSE_LINKED_RX_MESSAGES != 0 )`
`569`	`571`	`if( xResult > 0 )`
`570`	`572`	`{`
`571`		`- pxStartDescriptor->pxInterface = pxMyInterface;`
`572`		`- pxStartDescriptor->pxEndPoint = FreeRTOS_MatchingEndpoint( pxMyInterface, pxStartDescriptor->pucEthernetBuffer );`
`573`	`573`	`xRxEvent.pvData = ( void * ) pxStartDescriptor;`
`574`	`574`	`if( xSendEventStructToIPTask( &xRxEvent, ( TickType_t ) 100U ) != pdPASS )`
`575`	`575`	`{`