diff options
| author | Guillem Jover <guillem@debian.org> | 2005-11-10 02:16:27 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2005-11-10 02:16:27 +0000 |
| commit | 02c18ad86b56001de7361962ce31556959225946 (patch) | |
| tree | cd0e2ba66b8295d5b7292ee7e151f77fa411b34e /debian | |
| parent | 184e4ec281911f24da314b444104379e777c8a1f (diff) | |
Fix lvalue errors with gcc 4.0.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/11_nic_update.patch | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/debian/patches/11_nic_update.patch b/debian/patches/11_nic_update.patch index 8cc4e03..44dba34 100644 --- a/debian/patches/11_nic_update.patch +++ b/debian/patches/11_nic_update.patch @@ -21,6 +21,8 @@ * linux/dev/drivers/net/eepro100.c: Remove obsoleted file. * linux/src/drivers/net/eepro100.c (pci_id_tbl): Add PCI ID's from linux-2.6.14-rc4. + * linux/src/drivers/net/ne2k-pci.c (ne2k_pci_block_input) + (ne2k_pci_block_output): Fix invalid lvalue errors with gcc 4.0. 2004-02-29 Alfred M. Szmidt <ams@kemisten.nu> @@ -17688,7 +17690,7 @@ diff -u -r1.1 ne2k-pci.c outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD); outb(count & 0xff, nic_base + EN0_RCNTLO); outb(count >> 8, nic_base + EN0_RCNTHI); -@@ -537,31 +537,28 @@ +@@ -537,31 +537,29 @@ outb(ring_offset >> 8, nic_base + EN0_RSARHI); outb(E8390_RREAD+E8390_START, nic_base + NE_CMD); @@ -17718,7 +17720,8 @@ diff -u -r1.1 ne2k-pci.c + if (count & 3) { + buf += count & ~3; + if (count & 2) -+ *((u16*)buf)++ = le16_to_cpu(inw(NE_BASE + NE_DATAPORT)); ++ *((u16*)buf) = le16_to_cpu(inw(NE_BASE + NE_DATAPORT)); ++ buf = (u16*)buf + 1; + if (count & 1) + *buf = inb(NE_BASE + NE_DATAPORT); + } @@ -17735,7 +17738,7 @@ diff -u -r1.1 ne2k-pci.c const unsigned char *buf, const int start_page) { int nic_base = NE_BASE; -@@ -569,15 +566,18 @@ +@@ -569,15 +567,18 @@ /* On little-endian it's always safe to round the count up for word writes. */ @@ -17758,7 +17761,7 @@ diff -u -r1.1 ne2k-pci.c return; } ei_status.dmaing |= 0x01; -@@ -603,24 +603,23 @@ +@@ -603,24 +604,25 @@ outb(0x00, nic_base + EN0_RSARLO); outb(start_page, nic_base + EN0_RSARHI); outb(E8390_RWRITE+E8390_START, nic_base + NE_CMD); @@ -17775,8 +17778,10 @@ diff -u -r1.1 ne2k-pci.c + outsl(NE_BASE + NE_DATAPORT, buf, count>>2); + if (count & 3) { + buf += count & ~3; -+ if (count & 2) -+ outw(cpu_to_le16(*((u16*)buf)++), NE_BASE + NE_DATAPORT); ++ if (count & 2) { ++ outw(cpu_to_le16(*((u16*)buf)), NE_BASE + NE_DATAPORT); ++ buf = (u16*)buf + 1; ++ } + } } -#else @@ -17793,7 +17798,7 @@ diff -u -r1.1 ne2k-pci.c LNS8390_init(dev,1); break; } -@@ -633,8 +632,8 @@ +@@ -633,8 +635,8 @@ /* * Local variables: |