Changeset 2999


Ignore:
Timestamp:
2006-01-16T22:23:29+01:00 (12 years ago)
Author:
nbd
Message:

fix typo

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/brcm-2.6/patches/004-b44_bcm47xx_support.patch

    r2998 r2999  
    11diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c 
    22--- linux.old/drivers/net/b44.c 2006-01-16 20:35:09.203794500 +0100 
    3 +++ linux.dev/drivers/net/b44.c 2006-01-16 20:40:29.023782000 +0100 
     3+++ linux.dev/drivers/net/b44.c 2006-01-16 22:20:45.631180500 +0100 
    44@@ -1,7 +1,9 @@ 
    55-/* b44.c: Broadcom 4400 device driver. 
     
    563563        return err; 
    564564 } 
    565 @@ -1865,22 +2243,54 @@ 
     565@@ -1865,22 +2243,55 @@ 
    566566 static int __devinit b44_get_invariants(struct b44 *bp) 
    567567 { 
     
    580580-       bp->dev->dev_addr[5] = eeprom[82]; 
    581581-       memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len); 
     582- 
     583-       bp->phy_addr = eeprom[90] & 0x1f; 
    582584+       u8 buf[32]; 
    583585+       int err = 0; 
    584   
    585 -       bp->phy_addr = eeprom[90] & 0x1f; 
     586+       unsigned long flags; 
     587+ 
    586588+#ifdef CONFIG_BCM947XX 
    587589+       if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) { 
     
    632634         * hardware, we'll land the ethernet header on a 2-byte boundary. 
    633635         */ 
    634 @@ -1889,11 +2299,7 @@ 
     636@@ -1889,11 +2300,7 @@ 
    635637        bp->imask = IMASK_DEF; 
    636638  
     
    644646        return err; 
    645647 } 
    646 @@ -2032,11 +2438,17 @@ 
     648@@ -2032,11 +2439,17 @@ 
    647649  
    648650        pci_save_state(bp->pdev); 
Note: See TracChangeset for help on using the changeset viewer.