diff options
author | 2014-07-08 08:54:00 +0000 | |
---|---|---|
committer | 2014-07-08 08:54:00 +0000 | |
commit | 8d99d872f20ff77cbe4a2e65bcadd435aa4f75bf (patch) | |
tree | af60764dc38231822d18bfb2530bec837a3edd29 | |
parent | repeat calls to getentrypy() with the same pid likely indicate reseeds. (diff) | |
download | wireguard-openbsd-8d99d872f20ff77cbe4a2e65bcadd435aa4f75bf.tar.xz wireguard-openbsd-8d99d872f20ff77cbe4a2e65bcadd435aa4f75bf.zip |
Remove left-over call to removed function m_clsetwms().
ok mpi
-rw-r--r-- | sys/dev/pci/if_athn_pci.c | 3 | ||||
-rw-r--r-- | sys/dev/pci/if_vmx.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/pcidevs | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/if_athn_pci.c b/sys/dev/pci/if_athn_pci.c index 012ea499fe6..9cef41340a0 100644 --- a/sys/dev/pci/if_athn_pci.c +++ b/sys/dev/pci/if_athn_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_pci.c,v 1.14 2013/12/06 21:03:03 deraadt Exp $ */ +/* $OpenBSD: if_athn_pci.c,v 1.15 2014/07/08 08:54:00 stsp Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -94,6 +94,7 @@ static const struct pci_matchid athn_pci_devices[] = { { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9160 }, { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9280 }, { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9281 }, + { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9281_2 }, { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9285 }, { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR2427 }, { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9227 }, diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c index 386c3fa8627..c156a5f5827 100644 --- a/sys/dev/pci/if_vmx.c +++ b/sys/dev/pci/if_vmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vmx.c,v 1.17 2014/07/08 05:35:19 dlg Exp $ */ +/* $OpenBSD: if_vmx.c,v 1.18 2014/07/08 08:54:00 stsp Exp $ */ /* * Copyright (c) 2013 Tsubai Masanari @@ -280,8 +280,6 @@ vmxnet3_attach(struct device *parent, struct device *self, void *aux) IFQ_SET_MAXLEN(&ifp->if_snd, NTXDESC); IFQ_SET_READY(&ifp->if_snd); - m_clsetwms(ifp, JUMBO_LEN, 2, NRXDESC - 1); - ifmedia_init(&sc->sc_media, IFM_IMASK, vmxnet3_media_change, vmxnet3_media_status); ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_AUTO, 0, NULL); diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index e643ec93fe5..fae32485c0c 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1728 2014/05/20 15:02:24 mpi Exp $ +$OpenBSD: pcidevs,v 1.1729 2014/07/08 08:54:00 stsp Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -1840,6 +1840,7 @@ product ATHEROS AR5211_DEFAULT 0x1112 AR5211 product ATHEROS AR5212_FPGA 0xf013 AR5212 product ATHEROS AR5211_FPGA11B 0xf11b AR5211Ref product ATHEROS AR5211_LEGACY 0xff12 AR5211Ref +product ATHEROS AR9281_2 0xff1c AR9281 /* Atmel products */ product ATMEL AT76C506 0x0506 AT76C506 |