X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffilter.c;h=573fb28103637f65d98411c9602bcb1899816471;hb=c4cf2d1c17594d333ccd819212756e3afb8b9924;hp=55eb6826dadb0e5ed3127ed7a65d1efe4a234f47;hpb=52aecc758f87ef7e273bb1df88116e0bbed6bfbf;p=pciutils.git diff --git a/lib/filter.c b/lib/filter.c index 55eb682..573fb28 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -45,7 +45,7 @@ pci_filter_parse_slot_v33(struct pci_filter *f, char *str) if (str[0] && strcmp(str, "*")) { long int x = strtol(str, &e, 16); - if ((e && *e) || (x < 0 || x > 0xffff)) + if ((e && *e) || (x < 0 || x > 0x7fffffff)) return "Invalid domain number"; f->domain = x; } @@ -129,7 +129,7 @@ pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d) return 0; if (f->device >= 0 || f->vendor >= 0) { - pci_fill_info_v33(d, PCI_FILL_IDENT); + pci_fill_info_v35(d, PCI_FILL_IDENT); if ((f->device >= 0 && f->device != d->device_id) || (f->vendor >= 0 && f->vendor != d->vendor_id)) return 0; @@ -163,7 +163,7 @@ pci_filter_import_v30(struct pci_filter_v30 *old, struct pci_filter *new) { new->domain = old->domain; new->bus = old->bus; - new->slot = old->bus; + new->slot = old->slot; new->func = old->func; new->vendor = old->vendor; new->device = old->device; @@ -175,7 +175,7 @@ pci_filter_export_v30(struct pci_filter *new, struct pci_filter_v30 *old) { old->domain = new->domain; old->bus = new->bus; - old->slot = new->bus; + old->slot = new->slot; old->func = new->func; old->vendor = new->vendor; old->device = new->device;