Lucid SRU, LP562742, fix r8169 ethernet MAC address borkage

[Tim Gardner]

Indeed, all of these patches are now in 2.6.32.y, but they were not when 
I first proposed them. They likely appeared in stable 'cause I sent an 
email requesting that they be added.

rtg

On 05/19/2010 12:31 PM, Stefan Bader wrote:
> Somehow a lot of these feel too familiar. I would wait on those until I managed
> to pull in the latest stable patches and then get back to those.
>
> -Stefan
>
> On 05/14/2010 11:35 AM, Tim Gardner wrote:
>> The following series of changes are clean cherry picks from upstream sufficient
>> and necessary to correct the bug reported in https://bugs.launchpad.net/bugs/562742
>>
>> The following changes since commit f0819aaf4948e34a44d9d685615ddee74271cd70:
>>    Chase Douglas (1):
>>          UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y
>>
>> are available in the git repository at:
>>
>>    git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp562742
>>
>> David Dillow (1):
>>        r8169: use correct barrier between cacheable and non-cacheable memory
>>
>> Francois Romieu (1):
>>        r8169: fix broken register writes
>>
>> H Hartley Sweeten (1):
>>        drivers/net/r8169.c: use %pM to shown MAC address
>>
>> Neil Horman (2):
>>        r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
>>        r8169: clean up my printk uglyness
>>
>> françois romieu (1):
>>        r8169: more broken register writes workaround
>>
>>   drivers/net/r8169.c |   51 +++++++++++++++++++++++++++++++++++----------------
>>   1 files changed, 35 insertions(+), 16 deletions(-)
>>  From a6c647a849c6dc21fb6c1a1bd83e791ad77d87a1 Mon Sep 17 00:00:00 2001
>> From: H Hartley Sweeten<hsweeten at visionengravers.com>
>> Date: Tue, 29 Dec 2009 20:10:01 -0800
>> Subject: [PATCH 1/6] drivers/net/r8169.c: use %pM to shown MAC address
>>
>> Use the %pM kernel extension to display the MAC address.
>>
>> Signed-off-by: H Hartley Sweeten<hsweeten at visionengravers.com>
>> Signed-off-by: David S. Miller<davem at davemloft.net>
>> (cherry picked from commit 30a6ae8d477dc90254eb785d8ccff6dfe7d9082e)
>>
>> Signed-off-by: Tim Gardner<tim.gardner at canonical.com>
>> ---
>>   drivers/net/r8169.c |    9 ++-------
>>   1 files changed, 2 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
>> index 7b98624..2b1d500 100644
>> --- a/drivers/net/r8169.c
>> +++ b/drivers/net/r8169.c
>> @@ -3195,15 +3195,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>>   	if (netif_msg_probe(tp)) {
>>   		u32 xid = RTL_R32(TxConfig)&  0x9cf0f8ff;
>>
>> -		printk(KERN_INFO "%s: %s at 0x%lx, "
>> -		       "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
>> -		       "XID %08x IRQ %d\n",
>> +		printk(KERN_INFO "%s: %s at 0x%lx, %pM, XID %08x IRQ %d\n",
>>   		       dev->name,
>>   		       rtl_chip_info[tp->chipset].name,
>> -		       dev->base_addr,
>> -		       dev->dev_addr[0], dev->dev_addr[1],
>> -		       dev->dev_addr[2], dev->dev_addr[3],
>> -		       dev->dev_addr[4], dev->dev_addr[5], xid, dev->irq);
>> +		       dev->base_addr, dev->dev_addr, xid, dev->irq);
>>   	}
>>
>>   	rtl8169_init_phy(dev, tp);
>
>
>


-- 
Tim Gardner tim.gardner at canonical.com