mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
refresh patches and remove trailing whitespaces
SVN-Revision: 24181
This commit is contained in:
parent
27189b328e
commit
a133b09b07
@ -1,8 +1,6 @@
|
|||||||
Index: linux-2.6.32.25/drivers/mtd/maps/physmap.c
|
--- a/drivers/mtd/maps/physmap.c
|
||||||
===================================================================
|
+++ b/drivers/mtd/maps/physmap.c
|
||||||
--- linux-2.6.32.25.orig/drivers/mtd/maps/physmap.c 2010-10-28 21:47:22.000000000 -0700
|
@@ -80,7 +80,7 @@ static const char *rom_probe_types[] = {
|
||||||
+++ linux-2.6.32.25/drivers/mtd/maps/physmap.c 2010-11-16 08:14:11.469582161 -0800
|
|
||||||
@@ -80,7 +80,7 @@
|
|
||||||
"map_rom",
|
"map_rom",
|
||||||
NULL };
|
NULL };
|
||||||
#ifdef CONFIG_MTD_PARTITIONS
|
#ifdef CONFIG_MTD_PARTITIONS
|
||||||
@ -11,11 +9,9 @@ Index: linux-2.6.32.25/drivers/mtd/maps/physmap.c
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int physmap_flash_probe(struct platform_device *dev)
|
static int physmap_flash_probe(struct platform_device *dev)
|
||||||
Index: linux-2.6.32.25/arch/mips/ar7/platform.c
|
--- a/arch/mips/ar7/platform.c
|
||||||
===================================================================
|
+++ b/arch/mips/ar7/platform.c
|
||||||
--- linux-2.6.32.25.orig/arch/mips/ar7/platform.c 2010-11-16 08:17:41.352090063 -0800
|
@@ -98,7 +98,7 @@ static struct resource physmap_flash_res
|
||||||
+++ linux-2.6.32.25/arch/mips/ar7/platform.c 2010-11-16 08:18:09.232119441 -0800
|
|
||||||
@@ -98,7 +98,7 @@
|
|
||||||
.name = "mem",
|
.name = "mem",
|
||||||
.flags = IORESOURCE_MEM,
|
.flags = IORESOURCE_MEM,
|
||||||
.start = 0x10000000,
|
.start = 0x10000000,
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
+ tristate "TI AR7 GPIO Support"
|
+ tristate "TI AR7 GPIO Support"
|
||||||
+ depends on AR7
|
+ depends on AR7
|
||||||
+ help
|
+ help
|
||||||
+ Give userspace access to the GPIO pins on the Texas Instruments AR7
|
+ Give userspace access to the GPIO pins on the Texas Instruments AR7
|
||||||
+ processors.
|
+ processors.
|
||||||
+
|
+
|
||||||
+ If compiled as a module, it will be called ar7_gpio.
|
+ If compiled as a module, it will be called ar7_gpio.
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
--- a/drivers/vlynq/vlynq.c
|
||||||
===================================================================
|
+++ b/drivers/vlynq/vlynq.c
|
||||||
--- linux-2.6.32.26.orig/drivers/vlynq/vlynq.c 2010-11-22 10:48:20.000000000 -0800
|
@@ -103,6 +103,12 @@ static void vlynq_dump_mem(u32 *base, in
|
||||||
+++ linux-2.6.32.26/drivers/vlynq/vlynq.c 2010-11-28 02:56:51.972405343 -0800
|
|
||||||
@@ -103,6 +103,12 @@
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -15,7 +13,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
/* Check the VLYNQ link status with a given device */
|
/* Check the VLYNQ link status with a given device */
|
||||||
static int vlynq_linked(struct vlynq_device *dev)
|
static int vlynq_linked(struct vlynq_device *dev)
|
||||||
{
|
{
|
||||||
@@ -117,20 +123,40 @@
|
@@ -117,20 +123,40 @@ static int vlynq_linked(struct vlynq_dev
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,7 +57,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void vlynq_irq_unmask(unsigned int irq)
|
static void vlynq_irq_unmask(unsigned int irq)
|
||||||
@@ -379,6 +405,61 @@
|
@@ -379,6 +405,61 @@ void vlynq_unregister_driver(struct vlyn
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(vlynq_unregister_driver);
|
EXPORT_SYMBOL(vlynq_unregister_driver);
|
||||||
|
|
||||||
@ -121,7 +119,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
/*
|
/*
|
||||||
* A VLYNQ remote device can clock the VLYNQ bus master
|
* A VLYNQ remote device can clock the VLYNQ bus master
|
||||||
* using a dedicated clock line. In that case, both the
|
* using a dedicated clock line. In that case, both the
|
||||||
@@ -392,29 +473,17 @@
|
@@ -392,29 +473,17 @@ static int __vlynq_try_remote(struct vly
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
vlynq_reset(dev);
|
vlynq_reset(dev);
|
||||||
@ -158,7 +156,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
vlynq_reset(dev);
|
vlynq_reset(dev);
|
||||||
@@ -437,21 +506,14 @@
|
@@ -437,21 +506,14 @@ static int __vlynq_try_local(struct vlyn
|
||||||
|
|
||||||
vlynq_reset(dev);
|
vlynq_reset(dev);
|
||||||
|
|
||||||
@ -188,7 +186,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
vlynq_reset(dev);
|
vlynq_reset(dev);
|
||||||
@@ -473,18 +535,10 @@
|
@@ -473,18 +535,10 @@ static int __vlynq_try_external(struct v
|
||||||
if (!vlynq_linked(dev))
|
if (!vlynq_linked(dev))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
@ -211,7 +209,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -507,18 +561,9 @@
|
@@ -507,18 +561,9 @@ static int __vlynq_enable_device(struct
|
||||||
* generation negotiated by hardware.
|
* generation negotiated by hardware.
|
||||||
* Check which device is generating clocks and perform setup
|
* Check which device is generating clocks and perform setup
|
||||||
* accordingly */
|
* accordingly */
|
||||||
@ -233,7 +231,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
break;
|
break;
|
||||||
case vlynq_ldiv1:
|
case vlynq_ldiv1:
|
||||||
case vlynq_ldiv2:
|
case vlynq_ldiv2:
|
||||||
@@ -528,15 +573,12 @@
|
@@ -528,15 +573,12 @@ static int __vlynq_enable_device(struct
|
||||||
case vlynq_ldiv6:
|
case vlynq_ldiv6:
|
||||||
case vlynq_ldiv7:
|
case vlynq_ldiv7:
|
||||||
case vlynq_ldiv8:
|
case vlynq_ldiv8:
|
||||||
@ -255,7 +253,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -548,15 +590,12 @@
|
@@ -548,15 +590,12 @@ static int __vlynq_enable_device(struct
|
||||||
case vlynq_rdiv6:
|
case vlynq_rdiv6:
|
||||||
case vlynq_rdiv7:
|
case vlynq_rdiv7:
|
||||||
case vlynq_rdiv8:
|
case vlynq_rdiv8:
|
||||||
@ -277,7 +275,7 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -732,13 +771,12 @@
|
@@ -732,13 +771,12 @@ static int vlynq_probe(struct platform_d
|
||||||
platform_set_drvdata(pdev, dev);
|
platform_set_drvdata(pdev, dev);
|
||||||
|
|
||||||
printk(KERN_INFO "%s: regs 0x%p, irq %d, mem 0x%p\n",
|
printk(KERN_INFO "%s: regs 0x%p, irq %d, mem 0x%p\n",
|
||||||
@ -294,11 +292,9 @@ Index: linux-2.6.32.26/drivers/vlynq/vlynq.c
|
|||||||
dev->dev_id = readl(&dev->remote->chip);
|
dev->dev_id = readl(&dev->remote->chip);
|
||||||
((struct plat_vlynq_ops *)(dev->dev.platform_data))->off(dev);
|
((struct plat_vlynq_ops *)(dev->dev.platform_data))->off(dev);
|
||||||
}
|
}
|
||||||
Index: linux-2.6.32.26/include/linux/vlynq.h
|
--- a/include/linux/vlynq.h
|
||||||
===================================================================
|
+++ b/include/linux/vlynq.h
|
||||||
--- linux-2.6.32.26.orig/include/linux/vlynq.h 2010-11-22 10:48:20.000000000 -0800
|
@@ -98,6 +98,7 @@ static inline struct vlynq_device *to_vl
|
||||||
+++ linux-2.6.32.26/include/linux/vlynq.h 2010-11-27 12:08:39.312438011 -0800
|
|
||||||
@@ -98,6 +98,7 @@
|
|
||||||
|
|
||||||
extern struct bus_type vlynq_bus_type;
|
extern struct bus_type vlynq_bus_type;
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
+ const char *prod_id ;
|
+ const char *prod_id ;
|
||||||
+ prod_id = prom_getenv("ProductID");
|
+ prod_id = prom_getenv("ProductID");
|
||||||
+ if(prod_id &&
|
+ if(prod_id &&
|
||||||
+ (strcmp(prod_id, "CYWL")==0 ||
|
+ (strcmp(prod_id, "CYWL")==0 ||
|
||||||
+ strcmp(prod_id, "CYWM")==0 ||
|
+ strcmp(prod_id, "CYWM")==0 ||
|
||||||
+ strcmp(prod_id, "CYLM")==0 ||
|
+ strcmp(prod_id, "CYLM")==0 ||
|
||||||
|
@ -632,7 +632,7 @@
|
|||||||
+ * GPIO Control
|
+ * GPIO Control
|
||||||
+ **********************************************************************/
|
+ **********************************************************************/
|
||||||
+
|
+
|
||||||
+typedef struct
|
+typedef struct
|
||||||
+{
|
+{
|
||||||
+ int pinSelReg;
|
+ int pinSelReg;
|
||||||
+ int shift;
|
+ int shift;
|
||||||
@ -721,7 +721,7 @@
|
|||||||
+ GPIO_CFG gpio_cfg;
|
+ GPIO_CFG gpio_cfg;
|
||||||
+ volatile PIN_SEL_REG_ARRAY_T *pin_sel_array = (PIN_SEL_REG_ARRAY_T*) AVALANCHE_PIN_SEL_BASE;
|
+ volatile PIN_SEL_REG_ARRAY_T *pin_sel_array = (PIN_SEL_REG_ARRAY_T*) AVALANCHE_PIN_SEL_BASE;
|
||||||
+ volatile TITAN_GPIO_CONTROL_T *gpio_cntl = (TITAN_GPIO_CONTROL_T*) KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
|
+ volatile TITAN_GPIO_CONTROL_T *gpio_cntl = (TITAN_GPIO_CONTROL_T*) KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
|
||||||
+
|
+
|
||||||
+ if (gpio_pin > 51 )
|
+ if (gpio_pin > 51 )
|
||||||
+ return(-1);
|
+ return(-1);
|
||||||
+
|
+
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
Index: linux-2.6.32.26/arch/mips/ar7/platform.c
|
--- a/arch/mips/ar7/platform.c
|
||||||
===================================================================
|
+++ b/arch/mips/ar7/platform.c
|
||||||
--- linux-2.6.32.26.orig/arch/mips/ar7/platform.c 2010-11-28 03:22:24.522383766 -0800
|
@@ -46,7 +46,6 @@ struct plat_vlynq_data {
|
||||||
+++ linux-2.6.32.26/arch/mips/ar7/platform.c 2010-11-28 04:17:24.872413302 -0800
|
|
||||||
@@ -46,7 +46,6 @@
|
|
||||||
int reset_bit;
|
int reset_bit;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -10,7 +8,7 @@ Index: linux-2.6.32.26/arch/mips/ar7/platform.c
|
|||||||
static int vlynq_on(struct vlynq_device *dev)
|
static int vlynq_on(struct vlynq_device *dev)
|
||||||
{
|
{
|
||||||
int result;
|
int result;
|
||||||
@@ -72,7 +71,8 @@
|
@@ -72,7 +71,8 @@ static int vlynq_on(struct vlynq_device
|
||||||
|
|
||||||
msleep(50);
|
msleep(50);
|
||||||
|
|
||||||
@ -20,7 +18,7 @@ Index: linux-2.6.32.26/arch/mips/ar7/platform.c
|
|||||||
msleep(50);
|
msleep(50);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -601,6 +601,18 @@
|
@@ -601,6 +601,18 @@ static inline unsigned char char2hex(cha
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,7 +37,7 @@ Index: linux-2.6.32.26/arch/mips/ar7/platform.c
|
|||||||
static void cpmac_get_mac(int instance, unsigned char *dev_addr)
|
static void cpmac_get_mac(int instance, unsigned char *dev_addr)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@@ -662,6 +674,7 @@
|
@@ -662,6 +674,7 @@ static int __init ar7_register_devices(v
|
||||||
u16 chip_id;
|
u16 chip_id;
|
||||||
int res;
|
int res;
|
||||||
u32 *bootcr, val;
|
u32 *bootcr, val;
|
||||||
@ -47,7 +45,7 @@ Index: linux-2.6.32.26/arch/mips/ar7/platform.c
|
|||||||
#ifdef CONFIG_SERIAL_8250
|
#ifdef CONFIG_SERIAL_8250
|
||||||
static struct uart_port uart_port[2];
|
static struct uart_port uart_port[2];
|
||||||
|
|
||||||
@@ -715,27 +728,6 @@
|
@@ -715,27 +728,6 @@ static int __init ar7_register_devices(v
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -75,7 +73,7 @@ Index: linux-2.6.32.26/arch/mips/ar7/platform.c
|
|||||||
res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id :
|
res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id :
|
||||||
cpmac_low.id, &fixed_phy_status);
|
cpmac_low.id, &fixed_phy_status);
|
||||||
if (res && res != -ENODEV)
|
if (res && res != -ENODEV)
|
||||||
@@ -748,6 +740,34 @@
|
@@ -748,6 +740,34 @@ static int __init ar7_register_devices(v
|
||||||
if (res)
|
if (res)
|
||||||
return res;
|
return res;
|
||||||
|
|
||||||
@ -110,7 +108,7 @@ Index: linux-2.6.32.26/arch/mips/ar7/platform.c
|
|||||||
detect_leds();
|
detect_leds();
|
||||||
res = platform_device_register(&ar7_gpio_leds);
|
res = platform_device_register(&ar7_gpio_leds);
|
||||||
if (res)
|
if (res)
|
||||||
@@ -771,8 +791,10 @@
|
@@ -771,8 +791,10 @@ static int __init ar7_register_devices(v
|
||||||
ar7_wdt_res.end = ar7_wdt_res.start + 0x20;
|
ar7_wdt_res.end = ar7_wdt_res.start + 0x20;
|
||||||
|
|
||||||
bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
|
bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
|
||||||
@ -123,10 +121,8 @@ Index: linux-2.6.32.26/arch/mips/ar7/platform.c
|
|||||||
|
|
||||||
/* Register watchdog only if enabled in hardware */
|
/* Register watchdog only if enabled in hardware */
|
||||||
if (val & AR7_WDT_HW_ENA)
|
if (val & AR7_WDT_HW_ENA)
|
||||||
Index: linux-2.6.32.26/arch/mips/include/asm/mach-ar7/ar7.h
|
--- a/arch/mips/include/asm/mach-ar7/ar7.h
|
||||||
===================================================================
|
+++ b/arch/mips/include/asm/mach-ar7/ar7.h
|
||||||
--- linux-2.6.32.26.orig/arch/mips/include/asm/mach-ar7/ar7.h 2010-11-28 03:22:24.522383766 -0800
|
|
||||||
+++ linux-2.6.32.26/arch/mips/include/asm/mach-ar7/ar7.h 2010-11-28 03:22:25.012385426 -0800
|
|
||||||
@@ -41,6 +41,7 @@
|
@@ -41,6 +41,7 @@
|
||||||
#define AR7_REGS_RESET (AR7_REGS_BASE + 0x1600)
|
#define AR7_REGS_RESET (AR7_REGS_BASE + 0x1600)
|
||||||
#define AR7_REGS_VLYNQ0 (AR7_REGS_BASE + 0x1800)
|
#define AR7_REGS_VLYNQ0 (AR7_REGS_BASE + 0x1800)
|
||||||
@ -135,11 +131,9 @@ Index: linux-2.6.32.26/arch/mips/include/asm/mach-ar7/ar7.h
|
|||||||
#define AR7_REGS_VLYNQ1 (AR7_REGS_BASE + 0x1c00)
|
#define AR7_REGS_VLYNQ1 (AR7_REGS_BASE + 0x1c00)
|
||||||
#define AR7_REGS_MDIO (AR7_REGS_BASE + 0x1e00)
|
#define AR7_REGS_MDIO (AR7_REGS_BASE + 0x1e00)
|
||||||
#define AR7_REGS_IRQ (AR7_REGS_BASE + 0x2400)
|
#define AR7_REGS_IRQ (AR7_REGS_BASE + 0x2400)
|
||||||
Index: linux-2.6.32.26/drivers/net/cpmac.c
|
--- a/drivers/net/cpmac.c
|
||||||
===================================================================
|
+++ b/drivers/net/cpmac.c
|
||||||
--- linux-2.6.32.26.orig/drivers/net/cpmac.c 2010-11-28 03:22:24.982383427 -0800
|
@@ -668,9 +668,8 @@ static void cpmac_hw_start(struct net_de
|
||||||
+++ linux-2.6.32.26/drivers/net/cpmac.c 2010-11-28 05:23:59.482390691 -0800
|
|
||||||
@@ -668,9 +668,8 @@
|
|
||||||
for (i = 0; i < 8; i++)
|
for (i = 0; i < 8; i++)
|
||||||
cpmac_write(priv->regs, CPMAC_MAC_ADDR_LO(i), dev->dev_addr[5]);
|
cpmac_write(priv->regs, CPMAC_MAC_ADDR_LO(i), dev->dev_addr[5]);
|
||||||
cpmac_write(priv->regs, CPMAC_MAC_ADDR_MID, dev->dev_addr[4]);
|
cpmac_write(priv->regs, CPMAC_MAC_ADDR_MID, dev->dev_addr[4]);
|
||||||
@ -151,7 +145,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
cpmac_write(priv->regs, CPMAC_MAX_LENGTH, CPMAC_SKB_SIZE);
|
cpmac_write(priv->regs, CPMAC_MAX_LENGTH, CPMAC_SKB_SIZE);
|
||||||
cpmac_write(priv->regs, CPMAC_UNICAST_CLEAR, 0xff);
|
cpmac_write(priv->regs, CPMAC_UNICAST_CLEAR, 0xff);
|
||||||
cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 0xff);
|
cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 0xff);
|
||||||
@@ -1104,8 +1103,6 @@
|
@@ -1104,8 +1103,6 @@ static const struct net_device_ops cpmac
|
||||||
.ndo_set_mac_address = eth_mac_addr,
|
.ndo_set_mac_address = eth_mac_addr,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -160,7 +154,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
static int __devinit cpmac_probe(struct platform_device *pdev)
|
static int __devinit cpmac_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
int rc, phy_id;
|
int rc, phy_id;
|
||||||
@@ -1117,24 +1114,26 @@
|
@@ -1117,24 +1114,26 @@ static int __devinit cpmac_probe(struct
|
||||||
|
|
||||||
pdata = pdev->dev.platform_data;
|
pdata = pdev->dev.platform_data;
|
||||||
|
|
||||||
@ -199,7 +193,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
|
dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
|
||||||
@@ -1168,7 +1167,7 @@
|
@@ -1168,7 +1167,7 @@ static int __devinit cpmac_probe(struct
|
||||||
priv->dev = dev;
|
priv->dev = dev;
|
||||||
priv->ring_size = 64;
|
priv->ring_size = 64;
|
||||||
priv->msg_enable = netif_msg_init(debug_level, 0xff);
|
priv->msg_enable = netif_msg_init(debug_level, 0xff);
|
||||||
@ -208,7 +202,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
|
|
||||||
snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
|
snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
|
||||||
|
|
||||||
@@ -1244,14 +1243,14 @@
|
@@ -1244,14 +1243,14 @@ int __devinit cpmac_init(void)
|
||||||
ar7_gpio_disable(26);
|
ar7_gpio_disable(26);
|
||||||
ar7_gpio_disable(27);
|
ar7_gpio_disable(27);
|
||||||
|
|
||||||
@ -228,7 +222,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
cpmac_mii->reset(cpmac_mii);
|
cpmac_mii->reset(cpmac_mii);
|
||||||
@@ -1262,14 +1261,7 @@
|
@@ -1262,14 +1261,7 @@ int __devinit cpmac_init(void)
|
||||||
else
|
else
|
||||||
msleep(10);
|
msleep(10);
|
||||||
|
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
Index: linux-2.6.32.26/drivers/net/cpmac.c
|
--- a/drivers/net/cpmac.c
|
||||||
===================================================================
|
+++ b/drivers/net/cpmac.c
|
||||||
--- linux-2.6.32.26.orig/drivers/net/cpmac.c 2010-11-28 05:23:59.482390691 -0800
|
@@ -369,6 +369,7 @@ static struct sk_buff *cpmac_rx_one(stru
|
||||||
+++ linux-2.6.32.26/drivers/net/cpmac.c 2010-11-28 05:26:02.494883201 -0800
|
|
||||||
@@ -369,6 +369,7 @@
|
|
||||||
struct cpmac_desc *desc)
|
struct cpmac_desc *desc)
|
||||||
{
|
{
|
||||||
struct sk_buff *skb, *result = NULL;
|
struct sk_buff *skb, *result = NULL;
|
||||||
@ -10,7 +8,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
|
|
||||||
if (unlikely(netif_msg_hw(priv)))
|
if (unlikely(netif_msg_hw(priv)))
|
||||||
cpmac_dump_desc(priv->dev, desc);
|
cpmac_dump_desc(priv->dev, desc);
|
||||||
@@ -382,9 +383,13 @@
|
@@ -382,9 +383,13 @@ static struct sk_buff *cpmac_rx_one(stru
|
||||||
|
|
||||||
skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
|
skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
|
||||||
if (likely(skb)) {
|
if (likely(skb)) {
|
||||||
@ -26,7 +24,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
desc->skb->ip_summed = CHECKSUM_NONE;
|
desc->skb->ip_summed = CHECKSUM_NONE;
|
||||||
priv->dev->stats.rx_packets++;
|
priv->dev->stats.rx_packets++;
|
||||||
priv->dev->stats.rx_bytes += desc->datalen;
|
priv->dev->stats.rx_bytes += desc->datalen;
|
||||||
@@ -456,7 +461,12 @@
|
@@ -456,7 +461,12 @@ static int cpmac_poll(struct napi_struct
|
||||||
|
|
||||||
skb = cpmac_rx_one(priv, desc);
|
skb = cpmac_rx_one(priv, desc);
|
||||||
if (likely(skb)) {
|
if (likely(skb)) {
|
||||||
@ -40,7 +38,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
received++;
|
received++;
|
||||||
}
|
}
|
||||||
desc = desc->next;
|
desc = desc->next;
|
||||||
@@ -951,7 +961,7 @@
|
@@ -951,7 +961,7 @@ static void cpmac_adjust_link(struct net
|
||||||
|
|
||||||
static int cpmac_open(struct net_device *dev)
|
static int cpmac_open(struct net_device *dev)
|
||||||
{
|
{
|
||||||
@ -49,7 +47,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
|
|||||||
struct cpmac_priv *priv = netdev_priv(dev);
|
struct cpmac_priv *priv = netdev_priv(dev);
|
||||||
struct resource *mem;
|
struct resource *mem;
|
||||||
struct cpmac_desc *desc;
|
struct cpmac_desc *desc;
|
||||||
@@ -995,7 +1005,12 @@
|
@@ -995,7 +1005,12 @@ static int cpmac_open(struct net_device
|
||||||
res = -ENOMEM;
|
res = -ENOMEM;
|
||||||
goto fail_desc;
|
goto fail_desc;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user