From owner-svn-src-head@FreeBSD.ORG  Wed Jul 11 02:57:33 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C6A021065691;
	Wed, 11 Jul 2012 02:57:33 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A1E5F8FC14;
	Wed, 11 Jul 2012 02:57:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6B2vX5q018147;
	Wed, 11 Jul 2012 02:57:33 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6B2vXeW018145;
	Wed, 11 Jul 2012 02:57:33 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201207110257.q6B2vXeW018145@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 11 Jul 2012 02:57:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238361 - head/sys/dev/usb
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jul 2012 02:57:34 -0000

Author: hrs
Date: Wed Jul 11 02:57:32 2012
New Revision: 238361
URL: http://svn.freebsd.org/changeset/base/238361

Log:
  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

Modified:
  head/sys/dev/usb/usb_pf.c

Modified: head/sys/dev/usb/usb_pf.c
==============================================================================
--- head/sys/dev/usb/usb_pf.c	Wed Jul 11 02:57:19 2012	(r238360)
+++ head/sys/dev/usb/usb_pf.c	Wed Jul 11 02:57:32 2012	(r238361)
@@ -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,
 	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)