summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS8
-rw-r--r--configure.ac2
-rw-r--r--ethtool.8.in2
3 files changed, 10 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 81580cc..c4825c8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Version 3.6 - October 5, 2012
+
+ * Feature: Allow setting MDI-X state (-s option)
+ * Fix: Preserve pause advertising bits when setting speed and
+ duplex with autoneg on (-s option)
+ * Fix: Don't call ioctl to set EEE parameters if they are the same
+ as the current parameters (--set-eee option)
+
Version 3.5 - August 2, 2012
* Feature: Display support for 1000BASE-KX and 10GBASE-KX4 link modes
diff --git a/configure.ac b/configure.ac
index b803f21..0c597c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ethtool, 3.5, netdev@vger.kernel.org)
+AC_INIT(ethtool, 3.6, netdev@vger.kernel.org)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([ethtool.c])
AM_INIT_AUTOMAKE([gnu])
diff --git a/ethtool.8.in b/ethtool.8.in
index 2799e25..a3c7fbb 100644
--- a/ethtool.8.in
+++ b/ethtool.8.in
@@ -113,7 +113,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "June 2012" "Ethtool version @VERSION@"
+.TH ETHTOOL 8 "October 2012" "Ethtool version @VERSION@"
.SH NAME
ethtool \- query or control network driver and hardware settings
.