diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-06-18 18:53:03 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-06-18 18:53:03 +0000 |
| commit | d1ea1302b311308a8006e544b2f23686e3651227 (patch) | |
| tree | 23210a1dedfd1ad257b5c8f7c14ae5e04e20684d | |
| parent | a8a360403bc3d2677eb2f9caac61df98b9c71222 (diff) | |
Remove the if (1) that makes blambert@ cry. Appreciated blambert@
| -rw-r--r-- | sys/dev/pci/if_vr.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 57038d4af7e..1dbe51a569e 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.96 2009/06/18 17:48:15 claudio Exp $ */ +/* $OpenBSD: if_vr.c,v 1.97 2009/06/18 18:53:02 claudio Exp $ */ /* * Copyright (c) 1997, 1998 @@ -865,7 +865,7 @@ vr_rxeof(struct vr_softc *sc) total_len -= ETHER_CRC_LEN; #ifdef __STRICT_ALIGNMENT - if (1) { + { struct mbuf *m0; m0 = m_devget(mtod(m, caddr_t), total_len, ETHER_ALIGN, ifp, NULL); @@ -875,12 +875,11 @@ vr_rxeof(struct vr_softc *sc) continue; } m = m0; - } else -#endif - { - m->m_pkthdr.rcvif = ifp; - m->m_pkthdr.len = m->m_len = total_len; } +#else + m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.len = m->m_len = total_len; +#endif ifp->if_ipackets++; if (sc->vr_quirks & VR_Q_CSUM && |