summaryrefslogtreecommitdiff
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2022-11-14 16:54:38 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2022-11-14 16:54:38 +0100
commitaf3ab6492459a70f9fe572c3a42e6cdb6cbc44c4 (patch)
tree5d02d19f76ea5ac1b2502fb8311983ad220a52e3 /commands
parent66544641b2dd00c37e16d8e1ac39a34ec4e57cb8 (diff)
parentff9c801b9e807fd3b429849e654725591a3d1eb8 (diff)
downloadbarebox-af3ab6492459a70f9fe572c3a42e6cdb6cbc44c4.tar.gz
Merge branch 'for-next/promisc'
Diffstat (limited to 'commands')
-rw-r--r--commands/ethlog.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/commands/ethlog.c b/commands/ethlog.c
index 0cc93ba808..7885d32c6b 100644
--- a/commands/ethlog.c
+++ b/commands/ethlog.c
@@ -29,11 +29,14 @@ static int do_ethlog(int argc, char *argv[])
{
struct eth_device *edev;
const char *edevname;
- bool remove = false;
- int opt;
+ bool remove = false, promisc = false;
+ int opt, ret;
- while ((opt = getopt(argc, argv, "r")) > 0) {
+ while ((opt = getopt(argc, argv, "pr")) > 0) {
switch (opt) {
+ case 'p':
+ promisc = true;
+ break;
case 'r':
remove = true;
break;
@@ -56,10 +59,19 @@ static int do_ethlog(int argc, char *argv[])
if (remove) {
edev->tx_monitor = NULL;
edev->rx_monitor = NULL;
+ if (promisc)
+ eth_set_promisc(edev, false);
return 0;
}
+ if (promisc) {
+ ret = eth_set_promisc(edev, true);
+ if (ret)
+ dev_warn(&edev->dev, "Failed to set promisc mode: %pe\n",
+ ERR_PTR(ret));
+ }
+
edev->tx_monitor = ethlog_tx_monitor;
edev->rx_monitor = ethlog_rx_monitor;
@@ -69,12 +81,13 @@ static int do_ethlog(int argc, char *argv[])
BAREBOX_CMD_HELP_START(ethlog)
BAREBOX_CMD_HELP_TEXT("Options:")
BAREBOX_CMD_HELP_OPT("-r", "remove log handler from Ethernet interface")
+BAREBOX_CMD_HELP_OPT("-p", "Enable promisc mode, or disable if -r is used")
BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(ethlog)
.cmd = do_ethlog,
BAREBOX_CMD_DESC("ETHLOG - tool to get dump of Ethernet packets")
- BAREBOX_CMD_OPTS("[-r] [device]")
+ BAREBOX_CMD_OPTS("[-rp] [device]")
BAREBOX_CMD_GROUP(CMD_GRP_NET)
BAREBOX_CMD_COMPLETE(eth_complete)
BAREBOX_CMD_END