svn commit: r188450 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb net

[Maksim Yevmenkin]

Author: emax
Date: Tue Feb 10 20:04:20 2009
New Revision: 188450
URL: http://svn.freebsd.org/changeset/base/188450

Log:
  MFC r182880$$
  
  Add new TAPGIFNAME tap(4) character device ioctl. This is a
  convenient shortcut to obtain network interface name using
  file descriptor for character device.
  
  Obtained from:	NetBSD

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/net/if_tap.c
  stable/7/sys/net/if_tap.h

Modified: stable/7/sys/net/if_tap.c
==============================================================================
--- stable/7/sys/net/if_tap.c	Tue Feb 10 20:03:26 2009	(r188449)
+++ stable/7/sys/net/if_tap.c	Tue Feb 10 20:04:20 2009	(r188450)
@@ -745,6 +745,12 @@ tapioctl(struct cdev *dev, u_long cmd, c
 			*(int *)data = tapdebug;
 			break;
 
+		case TAPGIFNAME: {
+			struct ifreq	*ifr = (struct ifreq *) data;
+
+			strlcpy(ifr->ifr_name, ifp->if_xname, IFNAMSIZ);
+			} break;
+
 		case FIONBIO:
 			break;
 

Modified: stable/7/sys/net/if_tap.h
==============================================================================
--- stable/7/sys/net/if_tap.h	Tue Feb 10 20:03:26 2009	(r188449)
+++ stable/7/sys/net/if_tap.h	Tue Feb 10 20:04:20 2009	(r188450)
@@ -55,6 +55,7 @@ struct tapinfo {
 #define	TAPGDEBUG		_IOR('t', 89, int)
 #define	TAPSIFINFO		_IOW('t', 91, struct tapinfo)
 #define	TAPGIFINFO		_IOR('t', 92, struct tapinfo)
+#define	TAPGIFNAME		_IOR('t', 93, struct ifreq)
 
 /* VMware ioctl's */
 #define VMIO_SIOCSIFFLAGS	_IOWINT('V', 0)