From: Michael Brown <mcb30@etherboot.org>
Date: Thu, 10 Aug 2006 17:35:14 +0000 (+0000)
Subject: command->data_{in,out} are now userptr_t, so it is invalid to compare
X-Git-Tag: v0.9.3~1100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2497270c145377615766f668ea72de8a29605865;p=thirdparty%2Fipxe.git

command->data_{in,out} are now userptr_t, so it is invalid to compare
against NULL.
---

diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index c7c47cbee..e970fb30d 100644
--- a/src/net/tcp/iscsi.c
+++ b/src/net/tcp/iscsi.c
@@ -129,7 +129,7 @@ static void iscsi_rx_data_in ( struct iscsi_session *iscsi, void *data,
 	/* Copy data to data-in buffer */
 	offset = ntohl ( data_in->offset ) + iscsi->rx_offset;
 	assert ( iscsi->command != NULL );
-	assert ( iscsi->command->data_in != NULL );
+	assert ( iscsi->command->data_in );
 	assert ( ( offset + len ) <= iscsi->command->data_in_len );
 	copy_to_user ( iscsi->command->data_in, offset, data, len );
 
@@ -235,7 +235,7 @@ static void iscsi_tx_data_out ( struct iscsi_session *iscsi,
 		   iscsi->tx_offset );
 	remaining = ( ISCSI_DATA_LEN ( data_out->lengths ) - iscsi->tx_offset);
 	assert ( iscsi->command != NULL );
-	assert ( iscsi->command->data_out != NULL );
+	assert ( iscsi->command->data_out );
 	assert ( ( offset + remaining ) <= iscsi->command->data_out_len );
 	
 	if ( remaining < len )