upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 14:26:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from r234532:

Browse source 
- Fix an ifname matching issue which prevented "ifconfig wlan0 create" from
  working.
- Return non-zero status when unit < 0.

Spotted by:	dhw
This commit is contained in:
Hiroki Sato 2012-07-11 02:57:32 +00:00
parent 310dacd09b
commit 89b4ba9934
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/dev/usb/usb_pf.c
View file

@ -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)