re,rl and BURN_BRIDGES

[Jiri Mikulas]

Hello
when i use BURN_BRIDGES in kernel config,
it seems that there is resubmited old part of code
in function suspend and resume - PCIR_MAPS symbol
i made diff for me  - see attachment
please could anybody submit corrected version into cvs tree?
i'm not maintainer ...
Thanks for help  :)
Jiri

-------------- next part --------------
--- sys/pci/if_rl.c	Thu Sep 11 06:05:01 2003
+++ sys/pci/if_rl.c	Tue Sep 23 16:09:10 2003
@@ -1915,7 +1915,7 @@
 	rl_stop(sc);
 
 	for (i = 0; i < 5; i++)
-		sc->saved_maps[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4);
+		sc->saved_maps[i] = pci_read_config(dev, PCIR_BAR(i), 4);
 	sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4);
 	sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1);
 	sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1);
@@ -1944,7 +1944,7 @@
 
 	/* better way to do this? */
 	for (i = 0; i < 5; i++)
-		pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4);
+		pci_write_config(dev, PCIR_BAR(i), sc->saved_maps[i], 4);
 	pci_write_config(dev, PCIR_BIOS, sc->saved_biosaddr, 4);
 	pci_write_config(dev, PCIR_INTLINE, sc->saved_intline, 1);
 	pci_write_config(dev, PCIR_CACHELNSZ, sc->saved_cachelnsz, 1);
--- sys/dev/re/if_re.c	Sat Sep 20 23:18:27 2003
+++ sys/dev/re/if_re.c	Tue Sep 23 16:06:35 2003
@@ -2423,7 +2423,7 @@
 	re_stop(sc);
 
 	for (i = 0; i < 5; i++)
-		sc->saved_maps[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4);
+		sc->saved_maps[i] = pci_read_config(dev, PCIR_BAR(i), 4);
 	sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4);
 	sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1);
 	sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1);
@@ -2452,7 +2452,7 @@
 
 	/* better way to do this? */
 	for (i = 0; i < 5; i++)
-		pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4);
+		pci_write_config(dev, PCIR_BAR(i), sc->saved_maps[i], 4);
 	pci_write_config(dev, PCIR_BIOS, sc->saved_biosaddr, 4);
 	pci_write_config(dev, PCIR_INTLINE, sc->saved_intline, 1);
 	pci_write_config(dev, PCIR_CACHELNSZ, sc->saved_cachelnsz, 1);