From 6ca4cf4dce9d14b48e942fa3cefc4d3493a2e140 Mon Sep 17 00:00:00 2001 From: Bernd Walter Date: Fri, 13 Jun 2003 22:34:03 +0000 Subject: [PATCH] Fix alignment requirements of tulip_rombuf by further increasing tulip_boardid size. Add a comment to tulip_rombuf about this requirement. I have had panics on alpha while probing a de card. --- sys/dev/de/if_devar.h | 8 ++++---- sys/pci/if_devar.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h index 39ee9225a0ab..13d2357e86eb 100644 --- a/sys/dev/de/if_devar.h +++ b/sys/dev/de/if_devar.h @@ -609,10 +609,10 @@ struct _tulip_softc_t { */ u_int32_t tulip_setupbuf[192/sizeof(u_int32_t)]; u_int32_t tulip_setupdata[192/sizeof(u_int32_t)]; - char tulip_boardid[17]; /* buffer for board ID */ - u_int8_t tulip_rombuf[128]; - u_int8_t tulip_pci_busno; /* needed for multiport boards */ - u_int8_t tulip_pci_devno; /* needed for multiport boards */ + char tulip_boardid[24]; /* buffer for board ID */ + u_int8_t tulip_rombuf[128]; /* must be aligned */ + u_int8_t tulip_pci_busno; /* needed for multiport boards */ + u_int8_t tulip_pci_devno; /* needed for multiport boards */ u_int8_t tulip_connidx; tulip_srom_connection_t tulip_conntype; tulip_desc_t *tulip_rxdescs; diff --git a/sys/pci/if_devar.h b/sys/pci/if_devar.h index 39ee9225a0ab..13d2357e86eb 100644 --- a/sys/pci/if_devar.h +++ b/sys/pci/if_devar.h @@ -609,10 +609,10 @@ struct _tulip_softc_t { */ u_int32_t tulip_setupbuf[192/sizeof(u_int32_t)]; u_int32_t tulip_setupdata[192/sizeof(u_int32_t)]; - char tulip_boardid[17]; /* buffer for board ID */ - u_int8_t tulip_rombuf[128]; - u_int8_t tulip_pci_busno; /* needed for multiport boards */ - u_int8_t tulip_pci_devno; /* needed for multiport boards */ + char tulip_boardid[24]; /* buffer for board ID */ + u_int8_t tulip_rombuf[128]; /* must be aligned */ + u_int8_t tulip_pci_busno; /* needed for multiport boards */ + u_int8_t tulip_pci_devno; /* needed for multiport boards */ u_int8_t tulip_connidx; tulip_srom_connection_t tulip_conntype; tulip_desc_t *tulip_rxdescs;