From 89b4ba993409957456c2234bb059b8b01ffc6e7e Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Wed, 11 Jul 2012 02:57:32 +0000 Subject: [PATCH] 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 --- sys/dev/usb/usb_pf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c index 4c88051b41f..b7b29d7bfec 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)