Changeset 58220 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

Timestamp:

Oct 13, 2015 4:27:57 PM (9 years ago)

Author:

vboxsync

Message:

VBoxNetAdp/linux: add rudimentary ethtool_ops with a view to use them
in vboxNetFltSetTapLinkState() hook to only report carrier when the
filter is actually attached.

File:

• trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

@@ -23 +23 @@
 #include "version-generated.h"
 #include "product-generated.h"
+#include <linux/ethtool.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -33 +34 @@
 #include <iprt/initterm.h>
 #include <iprt/mem.h>
+#include <iprt/string.h>
 
 /*
@@ -72 +74 @@
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
 
+static void vboxNetAdpEthGetDrvinfo(struct net_device *dev, struct ethtool_drvinfo *info);
+static int vboxNetAdpEthGetSettings(struct net_device *dev, struct ethtool_cmd *cmd);
+
 
 /*********************************************************************************************************************************
@@ -112 +117 @@
 };
 
+static const struct ethtool_ops gEthToolOpsVBoxNetAdp =
+{
+    .get_drvinfo        = vboxNetAdpEthGetDrvinfo,
+    .get_settings       = vboxNetAdpEthGetSettings,
+    .get_link           = ethtool_op_get_link,
+};
+
+
 struct VBoxNetAdpPriv
 {
@@ -151 +164 @@
     return &pPriv->Stats;
 }
+
+
+/* ethtool_ops::get_drvinfo */
+static void vboxNetAdpEthGetDrvinfo(struct net_device *pNetDev, struct ethtool_drvinfo *info)
+{
+    PVBOXNETADPPRIV pPriv = netdev_priv(pNetDev);
+
+    RTStrPrintf(info->driver, sizeof(info->driver),
+                "%s", VBOXNETADP_NAME);
+
+    /*
+     * Would be nice to include VBOX_SVN_REV, but it's not available
+     * here.  Use file's svn revision via svn keyword?
+     */
+    RTStrPrintf(info->version, sizeof(info->version),
+                "%s", VBOX_VERSION_STRING);
+
+    RTStrPrintf(info->fw_version, sizeof(info->fw_version),
+                "0x%08X", INTNETTRUNKIFPORT_VERSION);
+
+    RTStrPrintf(info->bus_info, sizeof(info->driver),
+                "N/A");
+}
+
+
+/* ethtool_ops::get_settings */
+static int vboxNetAdpEthGetSettings(struct net_device *pNetDev, struct ethtool_cmd *cmd)
+{
+    cmd->supported      = 0;
+    cmd->advertising    = 0;
+    ethtool_cmd_speed_set(cmd, SPEED_10);
+    cmd->duplex         = DUPLEX_FULL;
+    cmd->port           = PORT_TP;
+    cmd->phy_address    = 0;
+    cmd->transceiver    = XCVR_INTERNAL;
+    cmd->autoneg        = AUTONEG_DISABLE;
+    cmd->maxtxpkt       = 0;
+    cmd->maxrxpkt       = 0;
+    return 0;
+}
+
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
@@ -174 +228 @@
     pNetDev->get_stats = vboxNetAdpLinuxGetStats;
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
+
+    pNetDev->ethtool_ops = &gEthToolOpsVBoxNetAdp;
 
     pPriv = netdev_priv(pNetDev);