netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ethtool : Allow ethtool to set interface in loopback mode.
@ 2010-12-02  0:57 Mahesh Bandewar
  2010-12-02 14:21 ` Ben Hutchings
  0 siblings, 1 reply; 7+ messages in thread
From: Mahesh Bandewar @ 2010-12-02  0:57 UTC (permalink / raw)
  To: Ben Hutchings, linux-netdev; +Cc: Tom Herbert, David Miller

This patch adds -L command-line option to enable/disable loopback mode
and -l option to display current loopback mode on a give interface.


Signed-off-by Mahesh Bandewar <maheshb@google.com>

 ethtool-copy.h |    2 +
 ethtool.c      |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 0 deletions(-)

---

diff --git a/ethtool-copy.h b/ethtool-copy.h
index 75c3ae7..297a042 100644
--- a/ethtool-copy.h
+++ b/ethtool-copy.h
@@ -584,6 +584,8 @@ struct ethtool_flash {
 #define ETHTOOL_GSSET_INFO 0x00000037 /* Get string set info */
 #define ETHTOOL_GRXFHINDIR 0x00000038 /* Get RX flow hash indir'n table */
 #define ETHTOOL_SRXFHINDIR 0x00000039 /* Set RX flow hash indir'n table */
+#define ETHTOOL_SLOOPBACK  0x0000003a /* Enable / Disable loopback. */
+#define ETHTOOL_GLOOPBACK  0x0000003b /* Get loopback status. */

 /* compatibility with older code */
 #define SPARC_ETH_GSET     ETHTOOL_GSET
diff --git a/ethtool.c b/ethtool.c
index 239912b..d3f7ffc 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -114,6 +114,8 @@ static int do_srxntuple(int fd, struct ifreq *ifr);
 static int do_grxntuple(int fd, struct ifreq *ifr);
 static int do_flash(int fd, struct ifreq *ifr);
 static int do_permaddr(int fd, struct ifreq *ifr);
+static int do_sloopback(int fd, struct ifreq *ifr);
+static int do_gloopback(int fd, struct ifreq *ifr);

 static int send_ioctl(int fd, struct ifreq *ifr);

@@ -145,6 +147,8 @@ static enum {
    MODE_GNTUPLE,
    MODE_FLASHDEV,
    MODE_PERMADDR,
+   MODE_SLOOPBACK,
+   MODE_GLOOPBACK,
 } mode = MODE_GSET;

 static struct option {
@@ -266,6 +270,9 @@ static struct option {
        "Get Rx ntuple filters and actions\n" },
     { "-P", "--show-permaddr", MODE_PERMADDR,
        "Show permanent hardware address" },
+    { "-L", "--config-loopback", MODE_SLOOPBACK, "{En|Dis}able device
loopback",
+       "       [ enable | disable ]\n"},
+    { "-l", "--show-loopback", MODE_GLOOPBACK, "Show device loopback mode",},
     { "-h", "--help", MODE_HELP, "Show this help" },
     {}
 };
@@ -407,6 +414,8 @@ static char *flash_file = NULL;
 static int flash = -1;
 static int flash_region = -1;

+static int loopback_enable = 0;
+
 static int msglvl_changed;
 static u32 msglvl_wanted = 0;
 static u32 msglvl_mask = 0;
@@ -841,6 +850,8 @@ static void parse_cmdline(int argc, char **argp)
                (mode == MODE_GNTUPLE) ||
                (mode == MODE_PHYS_ID) ||
                (mode == MODE_FLASHDEV) ||
+               (mode == MODE_SLOOPBACK) ||
+               (mode == MODE_GLOOPBACK) ||
                (mode == MODE_PERMADDR)) {
                devname = argp[i];
                break;
@@ -1009,6 +1020,16 @@ static void parse_cmdline(int argc, char **argp)
                }
                break;
            }
+           if (mode == MODE_SLOOPBACK) {
+               if (!strcmp(argp[i], "enable"))
+                   loopback_enable = 1;
+               else if (!strcmp(argp[i], "disable"))
+                   loopback_enable = 0;
+               else
+                   show_usage(1);
+               i = argc;
+               break;
+           }
            if (mode != MODE_SSET)
                show_usage(1);
            if (!strcmp(argp[i], "speed")) {
@@ -2019,6 +2040,10 @@ static int doit(void)
        return do_flash(fd, &ifr);
    } else if (mode == MODE_PERMADDR) {
        return do_permaddr(fd, &ifr);
+   } else if (mode == MODE_SLOOPBACK) {
+       return do_sloopback(fd, &ifr);
+   } else if (mode == MODE_GLOOPBACK) {
+       return do_gloopback(fd, &ifr);
    }

    return 69;
@@ -3201,6 +3226,45 @@ static int do_grxntuple(int fd, struct ifreq *ifr)
    return 0;
 }

+static int do_sloopback(int fd, struct ifreq *ifr)
+{
+   int err;
+   struct ethtool_value edata;
+
+   edata.cmd = ETHTOOL_SLOOPBACK;
+   edata.data = loopback_enable;
+   ifr->ifr_data = (caddr_t)&edata;
+
+   err = send_ioctl(fd, ifr);
+   if (err < 0) {
+       char error[64];
+       sprintf(error, "Cannot %s loopback mode",
+               loopback_enable ? "enable" : "disable");
+       perror(error);
+       return 102;
+   }
+
+   return err;
+}
+
+static int do_gloopback(int fd, struct ifreq *ifr)
+{
+   int err;
+   struct ethtool_value edata;
+
+   edata.cmd = ETHTOOL_GLOOPBACK;
+   ifr->ifr_data = (caddr_t)&edata;
+
+   err = send_ioctl(fd, ifr);
+   if (err < 0) {
+       perror("Cannot get loopback status");
+       return 103;
+   }
+   printf("Loopback is %s\n", edata.data ? "enabled" : "disabled");
+
+   return err;
+}
+
 static int send_ioctl(int fd, struct ifreq *ifr)
 {
    return ioctl(fd, SIOCETHTOOL, ifr);

^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-12-05  1:33 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-02  0:57 [PATCH] ethtool : Allow ethtool to set interface in loopback mode Mahesh Bandewar
2010-12-02 14:21 ` Ben Hutchings
2010-12-02 22:35   ` [PATCH v2] " Mahesh Bandewar
2010-12-03 16:03     ` David Lamparter
2010-12-03 16:33       ` Ben Hutchings
2010-12-03 16:48         ` David Lamparter
2010-12-05  1:33           ` Bill Fink

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).