|
@@ -2064,12 +2064,10 @@ fore200e_get_esi(struct fore200e* fore200e)
|
|
|
return -EBUSY;
|
|
|
}
|
|
|
|
|
|
- printk(FORE200E "device %s, rev. %c, S/N: %d, ESI: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
|
|
+ printk(FORE200E "device %s, rev. %c, S/N: %d, ESI: %pM\n",
|
|
|
fore200e->name,
|
|
|
(prom->hw_revision & 0xFF) + '@', /* probably meaningless with SBA boards */
|
|
|
- prom->serial_number & 0xFFFF,
|
|
|
- prom->mac_addr[ 2 ], prom->mac_addr[ 3 ], prom->mac_addr[ 4 ],
|
|
|
- prom->mac_addr[ 5 ], prom->mac_addr[ 6 ], prom->mac_addr[ 7 ]);
|
|
|
+ prom->serial_number & 0xFFFF, &prom->mac_addr[2]);
|
|
|
|
|
|
for (i = 0; i < ESI_LEN; i++) {
|
|
|
fore200e->esi[ i ] = fore200e->atm_dev->esi[ i ] = prom->mac_addr[ i + 2 ];
|
|
@@ -2845,13 +2843,12 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
|
|
|
" interrupt line:\t\t%s\n"
|
|
|
" physical base address:\t0x%p\n"
|
|
|
" virtual base address:\t0x%p\n"
|
|
|
- " factory address (ESI):\t%02x:%02x:%02x:%02x:%02x:%02x\n"
|
|
|
+ " factory address (ESI):\t%pM\n"
|
|
|
" board serial number:\t\t%d\n\n",
|
|
|
fore200e_irq_itoa(fore200e->irq),
|
|
|
(void*)fore200e->phys_base,
|
|
|
fore200e->virt_base,
|
|
|
- fore200e->esi[0], fore200e->esi[1], fore200e->esi[2],
|
|
|
- fore200e->esi[3], fore200e->esi[4], fore200e->esi[5],
|
|
|
+ fore200e->esi,
|
|
|
fore200e->esi[4] * 256 + fore200e->esi[5]);
|
|
|
|
|
|
return len;
|