Add bnx2 prefix to structure name

ipxe · Aug 2, 2012 · 0f7deb4 · 0f7deb4
1 parent 69f1684
commit 0f7deb4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/drivers/net/bnx2.c b/src/drivers/net/bnx2.c
@@ -978,7 +978,7 @@ static void bnx2_poll_rx ( struct net_device *netdev ) {
 	unsigned int rx_idx;
 	uint32_t length;
 	uint16_t hw_cons = bnx2->status_blk->status_rx_quick_consumer_index0;
-	struct l2_fhdr *hdr;
+	struct bnx2_l2_fhdr *hdr;
 
 	rmb();
 	if ( ( hw_cons & MAX_RX_DESC_CNT ) == MAX_RX_DESC_CNT )
@@ -989,9 +989,9 @@ static void bnx2_poll_rx ( struct net_device *netdev ) {
 
 		iobuf = bnx2->rx_iobuf[rx_idx];
 		bnx2->rx_iobuf[rx_idx] = NULL;
-		hdr = ( struct l2_fhdr * ) iobuf->data;
-		iobuf->data += sizeof ( struct l2_fhdr ) + 2;
-		length = hdr->pkt_len - 4 + sizeof ( struct l2_fhdr ) + 2;
+		hdr = ( struct bnx2_l2_fhdr * ) iobuf->data;
+		iobuf->data += sizeof ( struct bnx2_l2_fhdr ) + 2;
+		length = hdr->pkt_len - 4 + sizeof ( struct bnx2_l2_fhdr ) + 2;
 
 		iob_put ( iobuf, length );
 		if ( hdr->errors )

diff --git a/src/drivers/net/bnx2.h b/src/drivers/net/bnx2.h
@@ -408,7 +408,7 @@ struct bnx2_status_block {
 #endif
 };
 
-struct l2_fhdr {
+struct bnx2_l2_fhdr {
 #if __BYTE_ORDER == __BIG_ENDIAN
 	uint16_t errors;
 	uint16_t status;