ethtool: add get permanent address option
Subsystems (2)
PATCH 1/1 ethtool: add get permanent address option
Add command level support for showing permanent address. The ioctl has been around for a long time but there was no option to display it.
Note: MAX_ADDR_LEN is defined in netdevice.h but including netdevice.h leads to multiple definition errors with if.h.
--- ethtool.8 | 6 ++++++ ethtool.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletions(-)
ethtool.8 +6 -0
@@ -176,6 +176,9 @@ ethtool \- Display or change ethernet card settings .I ethX .RI [ N ] +.B ethtool \-P|\-\-show-permaddr +.I ethX + .B ethtool \-r|\-\-negotiate .I ethX
@@ -388,6 +391,9 @@ blinking one or more LEDs on the specific ethernet port. .B N Length of time to perform phys-id, in seconds. .TP +.B \-P \-\-show-permaddr +Queries the specified ethernet device for permanent hardware address. +.TP .B \-r \-\-negotiate Restarts auto-negotiation on the specified ethernet device, if auto-negotiation is enabled.
ethtool.c +35 -1
@@ -51,6 +51,9 @@#ifndef SIOCETHTOOL #define SIOCETHTOOL 0x8946#endif +#ifndef MAX_ADDR_LEN +#define MAX_ADDR_LEN 32 +#endif #ifndef ARRAY_SIZE #define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0]))#endif
@@ -107,6 +110,8 @@ static int do_srxfhindir(int fd, struct ifreq *ifr);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 send_ioctl (int fd,struct ifreq *ifr); static enum {
@@ -136,6 +141,7 @@ static enum {MODE_SNTUPLE ,MODE_GNTUPLE ,MODE_FLASHDEV , +MODE_PERMADDR , } mode = MODE_GSET; static struct option {
@@ -247,6 +253,8 @@ static struct option { "action <queue or drop>\n" }, {"-u" ,"--show-ntuple" ,MODE_GNTUPLE , "Get Rx ntuple filters and actions\n" }, + { "-P", "--show-permaddr", MODE_PERMADDR, + "Show permanent hardware address" }, { "-h", "--help", MODE_HELP, "Show this help" }, {} };
@@ -750,7 +758,8 @@ static void parse_cmdline(int argc, char **argp) (mode == MODE_SNTUPLE) || (mode == MODE_GNTUPLE) || (mode == MODE_PHYS_ID) || - (mode == MODE_FLASHDEV)) { + (mode == MODE_FLASHDEV) | + (mode == MODE_PERMADDR)) { devname = argp[i];break ; }
@@ -1868,6 +1877,8 @@ static int doit(void)return do_grxntuple (fd, &ifr); }else if (mode ==MODE_FLASHDEV ) {return do_flash (fd, &ifr); + }else if (mode ==MODE_PERMADDR ) { +return do_permaddr (fd, &ifr); }return 69 ;
@@ -2950,6 +2961,29 @@ static int do_flash(int fd, struct ifreq *ifr)return err; } +static int do_permaddr (int fd,struct ifreq *ifr) +{ +int i, err; +struct ethtool_perm_addr *epaddr; + + epaddr =malloc (sizeof (struct ethtool_perm_addr ) +MAX_ADDR_LEN ); + epaddr->cmd =ETHTOOL_GPERMADDR ; + epaddr->size =MAX_ADDR_LEN ; + ifr->ifr_data = (caddr_t )epaddr; + + err =send_ioctl (fd, ifr); +if (err <0 ) +perror ("Cannot read permanent address\n" ); +else { +printf ("Permanent address:" ); +for (i =0 ; i < epaddr->size; i++) +printf ("%c%02x" , (i ==0 ) ?' ' :':' , + epaddr->data[i]); +printf ("\n" ); + } +return err; +} +static int do_srxntuple (int fd,struct ifreq *ifr) {int err;
Signature · 1 line
1.7.1
Quoted 6 lines · Stephen Hemminger
Add command level support for showing permanent address. The ioctl has been around for a long time but there was no option to display it.
Note:
MAX_ADDR_LENis defined innetdevice.hbut includingnetdevice.hleads to multiple definition errors withif.h.
[...]
Quoted 7 lines
ethtool.c +3
-0@@ -2950,6 +2961,29 @@ static int do_flash(int fd, struct ifreq *ifr)return err; } +static int do_permaddr (int fd,struct ifreq *ifr) +{ +int i, err;
ethtool.c static int do_flash(int fd, struct ifreq *ifr) · line 2976
Quoted 10 lines
ethtool.c +10
-0+struct ethtool_perm_addr *epaddr; + + epaddr =malloc (sizeof (struct ethtool_perm_addr ) +MAX_ADDR_LEN ); + epaddr->cmd =ETHTOOL_GPERMADDR ; + epaddr->size =MAX_ADDR_LEN ; + ifr->ifr_data = (caddr_t )epaddr; + + err =send_ioctl (fd, ifr); +if (err <0 ) +perror ("Cannot read permanent address\n" );
[...]
Don't include a newline in the argument to perror().
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
PATCH 1/1 ethtool: add get permanent address option (v2)
Add command level support for showing permanent address. The ioctl has been around for a long time but there was no option to display it.
Note: MAX_ADDR_LEN is defined in netdevice.h but including netdevice.h leads to multiple definition errors with if.h.
---
Fix perror(), memory leak and indenting (v2)
ethtool.8 | 6 ++++++ ethtool.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletions(-)
ethtool.8 +6 -0
@@ -176,6 +176,9 @@ ethtool \- Display or change ethernet card settings .I ethX .RI [ N ] +.B ethtool \-P|\-\-show-permaddr +.I ethX + .B ethtool \-r|\-\-negotiate .I ethX
@@ -388,6 +391,9 @@ blinking one or more LEDs on the specific ethernet port. .B N Length of time to perform phys-id, in seconds. .TP +.B \-P \-\-show-permaddr +Queries the specified ethernet device for permanent hardware address. +.TP .B \-r \-\-negotiate Restarts auto-negotiation on the specified ethernet device, if auto-negotiation is enabled.
ethtool.c +37 -1
@@ -51,6 +51,9 @@#ifndef SIOCETHTOOL #define SIOCETHTOOL 0x8946#endif +#ifndef MAX_ADDR_LEN +#define MAX_ADDR_LEN 32 +#endif #ifndef ARRAY_SIZE #define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0]))#endif
@@ -107,6 +110,8 @@ static int do_srxfhindir(int fd, struct ifreq *ifr);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 send_ioctl (int fd,struct ifreq *ifr); static enum {
@@ -136,6 +141,7 @@ static enum {MODE_SNTUPLE ,MODE_GNTUPLE ,MODE_FLASHDEV , +MODE_PERMADDR , } mode = MODE_GSET; static struct option {
@@ -247,6 +253,8 @@ static struct option { "action <queue or drop>\n" }, {"-u" ,"--show-ntuple" ,MODE_GNTUPLE , "Get Rx ntuple filters and actions\n" }, + { "-P", "--show-permaddr", MODE_PERMADDR, + "Show permanent hardware address" }, { "-h", "--help", MODE_HELP, "Show this help" }, {} };
@@ -750,7 +758,8 @@ static void parse_cmdline(int argc, char **argp) (mode == MODE_SNTUPLE) || (mode == MODE_GNTUPLE) || (mode == MODE_PHYS_ID) || - (mode == MODE_FLASHDEV)) { + (mode == MODE_FLASHDEV) | + (mode == MODE_PERMADDR)) { devname = argp[i];break ; }
@@ -1868,6 +1877,8 @@ static int doit(void)return do_grxntuple (fd, &ifr); }else if (mode ==MODE_FLASHDEV ) {return do_flash (fd, &ifr); + }else if (mode ==MODE_PERMADDR ) { +return do_permaddr (fd, &ifr); }return 69 ;
@@ -2950,6 +2961,31 @@ static int do_flash(int fd, struct ifreq *ifr)return err; } +static int do_permaddr (int fd,struct ifreq *ifr) +{ +int i, err; +struct ethtool_perm_addr *epaddr; + + epaddr =malloc (sizeof (struct ethtool_perm_addr ) +MAX_ADDR_LEN ); + epaddr->cmd =ETHTOOL_GPERMADDR ; + epaddr->size =MAX_ADDR_LEN ; + ifr->ifr_data = (caddr_t )epaddr; + + err =send_ioctl (fd, ifr); +if (err <0 ) +perror ("Cannot read permanent address" ); +else { +printf ("Permanent address:" ); +for (i =0 ; i < epaddr->size; i++) +printf ("%c%02x" , (i ==0 ) ?' ' :':' , + epaddr->data[i]); +printf ("\n" ); + } +free (epaddr); + +return err; +} +static int do_srxntuple (int fd,struct ifreq *ifr) {int err;
Signature · 1 line
1.7.1
Re: [PATCH] ethtool: add get permanent address option (v2)
ethtool.c
Quoted 1 line · Stephen Hemminger
ethtool.c +0
-0
[]
ethtool.c static void parse_cmdline(int argc, char **argp) · line 762
Quoted 7 lines
ethtool.c +2
-1@@ -750,7 +758,8 @@ static void parse_cmdline(int argc, char **argp) (mode ==MODE_SNTUPLE ) || (mode ==MODE_GNTUPLE ) || (mode ==MODE_PHYS_ID ) || - (mode == MODE_FLASHDEV)) { + (mode ==MODE_FLASHDEV ) | + (mode == MODE_PERMADDR)) {
One more vertical bar please.
Ben Hutchings
AppliedRe: [PATCH] ethtool: add get permanent address option (v2)
In reply to Stephen HemmingerQuoted 6 lines · Stephen Hemminger
Add command level support for showing permanent address. The ioctl has been around for a long time but there was no option to display it.
Note:
MAX_ADDR_LENis defined innetdevice.hbut includingnetdevice.hleads to multiple definition errors withif.h.
[...]
Applied, along with the fix-up noted by Joe Perches.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.