narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bofm] Use "mport" rather than "port" to describe mport value 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/5/head
Michael Brown 2011-05-04 10:19:28 +01:00
parent 44689343c0
commit 7fc1a0a1c5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interface/bofm/bofm.c
View File

@ -181,14 +181,14 @@ static int bofm_en ( struct bofm_device *bofm, struct bofm_en *en ) {
/* Retrieve current MAC address */ /* Retrieve current MAC address */
if ( ( rc = bofm->op->harvest ( bofm, en->mport, mac ) ) != 0 ) { if ( ( rc = bofm->op->harvest ( bofm, en->mport, mac ) ) != 0 ) {
DBG ( "BOFM: " PCI_FMT " port %d could not harvest: %s\n", DBG ( "BOFM: " PCI_FMT " mport %d could not harvest: %s\n",
PCI_ARGS ( bofm->pci ), en->mport, strerror ( rc ) ); PCI_ARGS ( bofm->pci ), en->mport, strerror ( rc ) );
return rc; return rc;
} }
/* Harvest MAC address if necessary */ /* Harvest MAC address if necessary */
if ( en->options & BOFM_EN_RQ_HVST_MASK ) { if ( en->options & BOFM_EN_RQ_HVST_MASK ) {
DBG ( "BOFM: " PCI_FMT " port %d harvested MAC %s\n", DBG ( "BOFM: " PCI_FMT " mport %d harvested MAC %s\n",
PCI_ARGS ( bofm->pci ), en->mport, eth_ntoa ( mac ) ); PCI_ARGS ( bofm->pci ), en->mport, eth_ntoa ( mac ) );
memcpy ( en->mac_a, mac, sizeof ( en->mac_a ) ); memcpy ( en->mac_a, mac, sizeof ( en->mac_a ) );
en->options |= ( BOFM_EN_EN_A | BOFM_EN_HVST ); en->options |= ( BOFM_EN_EN_A | BOFM_EN_HVST );
@ -197,7 +197,7 @@ static int bofm_en ( struct bofm_device *bofm, struct bofm_en *en ) {
/* Mark as changed if necessary */ /* Mark as changed if necessary */
if ( ( en->options & BOFM_EN_EN_A ) && if ( ( en->options & BOFM_EN_EN_A ) &&
( memcmp ( en->mac_a, mac, sizeof ( en->mac_a ) ) != 0 ) ) { ( memcmp ( en->mac_a, mac, sizeof ( en->mac_a ) ) != 0 ) ) {
DBG ( "BOFM: " PCI_FMT " port %d MAC %s", DBG ( "BOFM: " PCI_FMT " mport %d MAC %s",
PCI_ARGS ( bofm->pci ), en->mport, eth_ntoa ( mac ) ); PCI_ARGS ( bofm->pci ), en->mport, eth_ntoa ( mac ) );
DBG ( " changed to %s\n", eth_ntoa ( en->mac_a ) ); DBG ( " changed to %s\n", eth_ntoa ( en->mac_a ) );
en->options |= BOFM_EN_CHG_CHANGED; en->options |= BOFM_EN_CHG_CHANGED;
@ -207,7 +207,7 @@ static int bofm_en ( struct bofm_device *bofm, struct bofm_en *en ) {
if ( ( en->options & BOFM_EN_EN_A ) && if ( ( en->options & BOFM_EN_EN_A ) &&
( en->options & BOFM_EN_USAGE_ENTRY ) && ( en->options & BOFM_EN_USAGE_ENTRY ) &&
( ! ( en->options & BOFM_EN_USAGE_HARVEST ) ) ) { ( ! ( en->options & BOFM_EN_USAGE_HARVEST ) ) ) {
DBG ( "BOFM: " PCI_FMT " port %d applied MAC %s\n", DBG ( "BOFM: " PCI_FMT " mport %d applied MAC %s\n",
PCI_ARGS ( bofm->pci ), en->mport, PCI_ARGS ( bofm->pci ), en->mport,
eth_ntoa ( en->mac_a ) ); eth_ntoa ( en->mac_a ) );
memcpy ( mac, en->mac_a, sizeof ( mac ) ); memcpy ( mac, en->mac_a, sizeof ( mac ) );
@ -215,7 +215,7 @@ static int bofm_en ( struct bofm_device *bofm, struct bofm_en *en ) {
/* Store MAC address */ /* Store MAC address */
if ( ( rc = bofm->op->update ( bofm, en->mport, mac ) ) != 0 ) { if ( ( rc = bofm->op->update ( bofm, en->mport, mac ) ) != 0 ) {
DBG ( "BOFM: " PCI_FMT " port %d could not update: %s\n", DBG ( "BOFM: " PCI_FMT " mport %d could not update: %s\n",
PCI_ARGS ( bofm->pci ), en->mport, strerror ( rc ) ); PCI_ARGS ( bofm->pci ), en->mport, strerror ( rc ) );
return rc; return rc;
} }