diff options
| author | hrs <hrs@FreeBSD.org> | 2012-07-11 02:57:32 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2012-07-11 02:57:32 +0000 |
| commit | af9d0513949580fb1bceef338353bbba8083cec0 (patch) | |
| tree | 3b19022fe3a8020b5741d542ee7572a2cae0167c | |
| parent | 6183c30d852bea67cae2dfe81fe1a68eddc6f7a4 (diff) | |
| download | FreeBSD-src-af9d0513949580fb1bceef338353bbba8083cec0.zip FreeBSD-src-af9d0513949580fb1bceef338353bbba8083cec0.tar.gz | |
Merge from r234532:
- Fix an ifname matching issue which prevented "ifconfig wlan0 create" from
working.
- Return non-zero status when unit < 0.
Spotted by: dhw
| -rw-r--r-- | sys/dev/usb/usb_pf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c index 4c88051..b7b29d7 100644 --- a/sys/dev/usb/usb_pf.c +++ b/sys/dev/usb/usb_pf.c @@ -129,7 +129,7 @@ usbpf_ifname2ubus(const char *ifname) int unit; int error; - if (strncmp(ifname, USBUSNAME, sizeof(USBUSNAME)) <= 0) + if (strncmp(ifname, USBUSNAME, sizeof(USBUSNAME) - 1) != 0) return (NULL); error = ifc_name2unit(ifname, &unit); if (error || unit < 0) @@ -167,8 +167,10 @@ usbpf_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) struct usb_bus *ubus; error = ifc_name2unit(name, &unit); - if (error || unit < 0) + if (error) return (error); + if (unit < 0) + return (EINVAL); ubus = usbpf_ifname2ubus(name); if (ubus == NULL) |
