linux/ena update ENA linux driver to version 2.2.1

**Bug Fixes** * fix incorrect parameter to ena_indirection_table_get() in kernels in range [3.8, 3.16) Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
amzn · Jan 17, 2020 · ec0339b · ec0339b
1 parent d7c11ce
commit ec0339b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/kernel/linux/ena/RELEASENOTES.md b/kernel/linux/ena/RELEASENOTES.md
@@ -39,6 +39,11 @@ The driver was verified on the following distributions:
 SUSE Linux Enterprise Server 12 SP2
 SUSE Linux Enterprise Server 12 SP3
 
+## r2.2.1 release notes
+**Bug Fixes**
+* fix incorrect parameter to ena_indirection_table_get() in kernels in
+  range [3.8, 3.16)
+
 ## r2.2.0 release notes
 **New Features**
 * Implement XDP support for DROP and TX actions.

diff --git a/kernel/linux/ena/ena_ethtool.c b/kernel/linux/ena/ena_ethtool.c
@@ -795,7 +795,7 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir)
 {
 	struct ena_adapter *adapter = netdev_priv(netdev);
 
-	return ena_indirection_table_get(adapter->ena_dev, indir);
+	return ena_indirection_table_get(adapter, indir);
 }
 #endif /* >= 3.8.0 */
 

diff --git a/kernel/linux/ena/ena_netdev.h b/kernel/linux/ena/ena_netdev.h
@@ -53,7 +53,7 @@
 
 #define DRV_MODULE_VER_MAJOR	2
 #define DRV_MODULE_VER_MINOR	2
-#define DRV_MODULE_VER_SUBMINOR 0
+#define DRV_MODULE_VER_SUBMINOR 1
 
 #define DRV_MODULE_NAME		"ena"
 #ifndef DRV_MODULE_VERSION

diff --git a/kernel/linux/rpm/Makefile b/kernel/linux/rpm/Makefile
@@ -3,7 +3,7 @@
 # Author: Cristian Gafton <gafton@amazon.com>
 
 NAME	= ena
-VERSION	= 2.2.0
+VERSION	= 2.2.1
 
 TOPDIR	:= $(shell git rev-parse --show-toplevel)
 

diff --git a/kernel/linux/rpm/README-rpm.txt b/kernel/linux/rpm/README-rpm.txt
@@ -32,7 +32,7 @@ Once the pre-requisites have been installed, you can simply issue a
 "make" in this directory to build the kmod src.rpm package:
 
 bash$ make
-cd .. && git archive --format=tar --prefix=ena-2.2.0/ -o rpm/ena-2.2.0.tar ena_linux_2.2.0
+cd .. && git archive --format=tar --prefix=ena-2.2.1/ -o rpm/ena-2.2.1.tar ena_linux_2.2.1
 rpmbuild -bs \
             --define '_topdir %(pwd)' --define '_ntopdir %(pwd)' \
             --define '_builddir  %{_ntopdir}' \
@@ -41,7 +41,7 @@ rpmbuild -bs \
             --define '_rpmdir    %{_ntopdir}' \
             --define '_srcrpmdir %{_ntopdir}' \
         ena.spec
-Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.2.0-1.el7.3.src.rpm
+Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.2.1-1.el7.3.src.rpm
 bash$ _
 
 
@@ -50,16 +50,16 @@ COMPILING AND INSTALLING
 Once the src.rpm has been created, you can build binary packages for
 the installed kernel-devel and kernel-headers environments:
 
-bash$ rpmbuild --rebuild ena-2.2.0-1.el7.3.src.rpm
+bash$ rpmbuild --rebuild ena-2.2.1-1.el7.3.src.rpm
 [....]
-Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.0-1.el7.3.x86_64.rpm
-Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.2.0-1.el7.3.x86_64.rpm
+Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.1-1.el7.3.x86_64.rpm
+Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.2.1-1.el7.3.x86_64.rpm
 [...]
 bash$ _
 
 Now you should be able to install/deploy the resulting binary rpm
 packages using your preferred rpm install too. For example, using yum:
 
 bash$ sudo yum -y localinstall
-/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.0-1.el7.3.x86_64.rpm
+/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.1-1.el7.3.x86_64.rpm
 
diff --git a/kernel/linux/rpm/ena.spec b/kernel/linux/rpm/ena.spec
@@ -1,5 +1,5 @@
 %define kmod_name		ena
-%define kmod_driver_version	2.2.0
+%define kmod_driver_version	2.2.1
 %define kmod_rpm_release	1
 %define kmod_git_hash		3ac3e0bf079b2c0468f759f2213541e214a6dd77
 %define kmod_kbuild_dir		kernel/linux/ena
@@ -22,7 +22,7 @@ Source7:	preamble
 
 Name:		%{kmod_name}
 Version:	%{kmod_driver_version}
-Release:	%{kmod_rpm_release}%{?dist}.16
+Release:	%{kmod_rpm_release}%{?dist}.17
 Summary:	%{kmod_name} kernel module
 
 Group:		System/Kernel
@@ -99,6 +99,9 @@ install -m 644 -D source/%{kmod_kbuild_dir}/RELEASENOTES.md $RPM_BUILD_ROOT/usr/
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan 17 2020 Arthur Kiyanovski akiyano@amazon.com - 2.2.1-1.17
+- Update ENA driver to version 2.2.1
+
 * Sun Dec 22 2019 Arthur Kiyanovski akiyano@amazon.com - 2.2.0-1.16
 - Update ENA driver to version 2.2.0