diff -urN ethtool-2/ethtool.c ethtool-2-ipsec/ethtool.c --- ethtool-2/ethtool.c 2004-07-02 11:28:48.000000000 -0400 +++ ethtool-2-ipsec/ethtool.c 2004-11-21 03:15:46.000000000 -0500 @@ -118,7 +118,8 @@ * [ rx on|off ] \ * [ tx on|off ] \ * [ sg on|off ] \ - * [ tso on|off ] + * [ tso on|off ] \ + * [ ipsec on|off ] * ethtool -r DEVNAME * ethtool -p DEVNAME [ %d ] * ethtool -t DEVNAME [ online|offline ] @@ -190,7 +191,8 @@ " [ rx on|off ] \\\n" " [ tx on|off ] \\\n" " [ sg on|off ] \\\n" - " [ tso on|off ]\n" + " [ tso on|off ] \\\n" + " [ ipsec on|off ]\n" " ethtool -r DEVNAME\n" " ethtool -p DEVNAME [ %%d ]\n" " ethtool -t DEVNAME [online|(offline)]\n" @@ -236,6 +238,7 @@ static int off_csum_tx_wanted = -1; static int off_sg_wanted = -1; static int off_tso_wanted = -1; +static int off_ipsec_wanted = -1; static struct ethtool_pauseparam epause; static int gpause_changed = 0; @@ -339,6 +342,7 @@ { "tx", CMDL_BOOL, &off_csum_tx_wanted, NULL }, { "sg", CMDL_BOOL, &off_sg_wanted, NULL }, { "tso", CMDL_BOOL, &off_tso_wanted, NULL }, + { "ipsec", CMDL_BOOL, &off_ipsec_wanted, NULL }, }; static struct cmdline_info cmdline_pause[] = { @@ -1175,17 +1179,19 @@ return 0; } -static int dump_offload (int rx, int tx, int sg, int tso) +static int dump_offload (int rx, int tx, int sg, int tso, int ipsec) { fprintf(stdout, "rx-checksumming: %s\n" "tx-checksumming: %s\n" "scatter-gather: %s\n" - "tcp segmentation offload: %s\n", + "tcp segmentation offload: %s\n" + "IPSEC crypto offload: %s\n", rx ? "on" : "off", tx ? "on" : "off", sg ? "on" : "off", - tso ? "on" : "off"); + tso ? "on" : "off", + ipsec ? "on" : "off"); return 0; } @@ -1449,7 +1455,7 @@ static int do_goffload(int fd, struct ifreq *ifr) { struct ethtool_value eval; - int err, allfail = 1, rx = 0, tx = 0, sg = 0, tso = 0; + int err, allfail = 1, rx = 0, tx = 0, sg = 0, tso = 0, ipsec = 0; fprintf(stdout, "Offload parameters for %s:\n", devname); @@ -1493,12 +1499,22 @@ allfail = 0; } + eval.cmd = ETHTOOL_GIPSEC; + ifr->ifr_data = (caddr_t)&eval; + err = ioctl(fd, SIOCETHTOOL, ifr); + if (err) + perror("Cannot get device IPSEC offload settings"); + else { + ipsec = eval.data; + allfail = 0; + } + if (allfail) { fprintf(stdout, "no offload info available\n"); return 83; } - return dump_offload(rx, tx, sg, tso); + return dump_offload(rx, tx, sg, tso, ipsec); } static int do_soffload(int fd, struct ifreq *ifr) @@ -1553,6 +1569,18 @@ return 88; } } + + if (off_ipsec_wanted >= 0) { + changed = 1; + eval.cmd = ETHTOOL_SIPSEC; + eval.data = (off_ipsec_wanted == 1); + ifr->ifr_data = (caddr_t)&eval; + err = ioctl(fd, SIOCETHTOOL, ifr); + if (err) { + perror("Cannot set device IPSEEC offload settings"); + return 89; + } + } if (!changed) { fprintf(stdout, "no offload settings changed\n"); } diff -urN ethtool-2/ethtool-copy.h ethtool-2-ipsec/ethtool-copy.h --- ethtool-2/ethtool-copy.h 2003-07-19 11:19:52.000000000 -0400 +++ ethtool-2-ipsec/ethtool-copy.h 2004-11-21 02:46:03.000000000 -0500 @@ -283,6 +283,8 @@ #define ETHTOOL_GSTATS 0x0000001d /* get NIC-specific statistics */ #define ETHTOOL_GTSO 0x0000001e /* Get TSO enable (ethtool_value) */ #define ETHTOOL_STSO 0x0000001f /* Set TSO enable (ethtool_value) */ +#define ETHTOOL_GIPSEC 0x00000020 /* Get IPSEC enable (ethtool_value) */ +#define ETHTOOL_SIPSEC 0x00000021 /* Set IPSEC enable (ethtool_value) */ /* compatibility with older code */ #define SPARC_ETH_GSET ETHTOOL_GSET