[Midnightbsd-cvs] src [7864] trunk/sys/net/if_tap.c: Implement SIOCGIFMEDIA for if_tap(4)

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Sep 14 12:15:10 EDT 2016


Revision: 7864
          http://svnweb.midnightbsd.org/src/?rev=7864
Author:   laffer1
Date:     2016-09-14 12:15:09 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
Implement SIOCGIFMEDIA for if_tap(4)

  Appease certain if_tap(4) consumers by providing simulated Ethernet
  media status.

  DragonFly commit 70d9a675bf5441cc854a843ead702d08928c37f3

Obtained from: DragonFly

Modified Paths:
--------------
    trunk/sys/net/if_tap.c

Modified: trunk/sys/net/if_tap.c
===================================================================
--- trunk/sys/net/if_tap.c	2016-09-14 16:14:21 UTC (rev 7863)
+++ trunk/sys/net/if_tap.c	2016-09-14 16:15:09 UTC (rev 7864)
@@ -65,6 +65,7 @@
 #include <net/if.h>
 #include <net/if_clone.h>
 #include <net/if_dl.h>
+#include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/vnet.h>
@@ -602,7 +603,8 @@
 	struct tap_softc	*tp = ifp->if_softc;
 	struct ifreq		*ifr = (struct ifreq *)data;
 	struct ifstat		*ifs = NULL;
-	int			 dummy;
+	struct ifmediareq	*ifmr = NULL;
+	int			 dummy, error = 0;
 
 	switch (cmd) {
 		case SIOCSIFFLAGS: /* XXX -- just like vmnet does */
@@ -610,6 +612,22 @@
 		case SIOCDELMULTI:
 			break;
 
+		case SIOCGIFMEDIA:
+			ifmr = (struct ifmediareq *)data;
+			dummy = ifmr->ifm_count;
+			ifmr->ifm_count = 1;
+			ifmr->ifm_status = IFM_AVALID;
+			ifmr->ifm_active = IFM_ETHER;
+			if (tp->tap_flags & TAP_OPEN)
+				ifmr->ifm_status |= IFM_ACTIVE;
+			ifmr->ifm_current = ifmr->ifm_active;
+			if (dummy >= 1) {
+				int media = IFM_ETHER;
+				error = copyout(&media, ifmr->ifm_ulist,
+				    sizeof(int));
+			}
+			break;
+
 		case SIOCSIFMTU:
 			ifp->if_mtu = ifr->ifr_mtu;
 			break;
@@ -626,11 +644,11 @@
 			break;
 
 		default:
-			return (ether_ioctl(ifp, cmd, data));
-			/* NOT REACHED */
+			error = ether_ioctl(ifp, cmd, data);
+			break;
 	}
 
-	return (0);
+	return (error);
 } /* tapifioctl */
 
 



More information about the Midnightbsd-cvs mailing list