be2net: remove ASIC generation number from Kconfig

[safe/jmp/linux-2.6] / drivers / atm / fore200e.c

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index c2fa9fd..f7d6eba 100644 (file)
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -1795,7 +1795,7 @@ fore200e_getsockopt(struct atm_vcc* vcc, int level, int optname, void __user *op
 
 
 static int
-fore200e_setsockopt(struct atm_vcc* vcc, int level, int optname, void __user *optval, int optlen)
+fore200e_setsockopt(struct atm_vcc* vcc, int level, int optname, void __user *optval, unsigned int optlen)
 {
     /* struct fore200e* fore200e = FORE200E_DEV(vcc->dev); */
     
@@ -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 ];
@@ -2519,8 +2517,8 @@ fore200e_load_and_start_fw(struct fore200e* fore200e)
        return err;
 
     sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT);
-    if (request_firmware(&firmware, buf, device) == 1) {
-       printk(FORE200E "missing %s firmware image\n", fore200e->bus->model_name);
+    if ((err = request_firmware(&firmware, buf, device)) < 0) {
+       printk(FORE200E "problem loading firmware image %s\n", fore200e->bus->model_name);
        return err;
     }
 
@@ -2685,7 +2683,7 @@ static int __devexit fore200e_sba_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id fore200e_sba_match[] = {
+static const struct of_device_id fore200e_sba_match[] = {
        {
                .name = SBA200E_PROM_NAME,
                .data = (void *) &fore200e_bus[1],
@@ -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;
@@ -2906,8 +2903,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
        u32 media_index    = FORE200E_MEDIA_INDEX(fore200e->bus->read(&fore200e->cp_queues->media_type));
        u32 oc3_index;
 
-       if ((media_index < 0) || (media_index > 4))
-           media_index = 5;
+       if (media_index > 4)
+               media_index = 5;
        
        switch (fore200e->loop_mode) {
            case ATM_LM_NONE:    oc3_index = 0;