You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
86 lines
2.9 KiB
86 lines
2.9 KiB
From e30f48604e751c828d74ae23e4696c245c65411b Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:36:20 -0500
|
|
Subject: [PATCH 003/139] [netdrv] net: aquantia: replace internal driver
|
|
version code with uts
|
|
|
|
Message-id: <1604687916-15087-4-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338482
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 003/139] net: aquantia: replace internal driver version code with uts
|
|
Bugzilla: 1857861
|
|
RH-Acked-by: David Arcari <darcari@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1857861
|
|
|
|
commit 2d3910c4dc37813fedab8f056a62451eaf202c3a
|
|
Author: Igor Russkikh <Igor.Russkikh@aquantia.com>
|
|
Date: Wed Jun 26 12:35:33 2019 +0000
|
|
|
|
net: aquantia: replace internal driver version code with uts
|
|
|
|
As it was discussed some time previously, driver is better to
|
|
report kernel version string, as it in a best way identifies
|
|
the codebase.
|
|
|
|
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Signed-off-by: Igor Russkikh <irusskik@redhat.com>
|
|
|
|
Cc: David Arcari <darcari@redhat.com>
|
|
Cc: Igor Russkikh <irusskik@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
---
|
|
drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 7 +++----
|
|
drivers/net/ethernet/aquantia/atlantic/ver.h | 5 -----
|
|
2 files changed, 3 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
|
|
index 173be45463ee..02f1b70c4e25 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
|
|
@@ -9,6 +9,8 @@
|
|
#ifndef AQ_CFG_H
|
|
#define AQ_CFG_H
|
|
|
|
+#include <generated/utsrelease.h>
|
|
+
|
|
#define AQ_CFG_VECS_DEF 8U
|
|
#define AQ_CFG_TCS_DEF 1U
|
|
|
|
@@ -86,10 +88,7 @@
|
|
#define AQ_CFG_DRV_AUTHOR "aQuantia"
|
|
#define AQ_CFG_DRV_DESC "aQuantia Corporation(R) Network Driver"
|
|
#define AQ_CFG_DRV_NAME "atlantic"
|
|
-#define AQ_CFG_DRV_VERSION __stringify(NIC_MAJOR_DRIVER_VERSION)"."\
|
|
- __stringify(NIC_MINOR_DRIVER_VERSION)"."\
|
|
- __stringify(NIC_BUILD_DRIVER_VERSION)"."\
|
|
- __stringify(NIC_REVISION_DRIVER_VERSION) \
|
|
+#define AQ_CFG_DRV_VERSION UTS_RELEASE \
|
|
AQ_CFG_DRV_VERSION_SUFFIX
|
|
|
|
#endif /* AQ_CFG_H */
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/ver.h b/drivers/net/ethernet/aquantia/atlantic/ver.h
|
|
index 23374bffa92b..597654b51e01 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/ver.h
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/ver.h
|
|
@@ -7,11 +7,6 @@
|
|
#ifndef VER_H
|
|
#define VER_H
|
|
|
|
-#define NIC_MAJOR_DRIVER_VERSION 2
|
|
-#define NIC_MINOR_DRIVER_VERSION 0
|
|
-#define NIC_BUILD_DRIVER_VERSION 4
|
|
-#define NIC_REVISION_DRIVER_VERSION 0
|
|
-
|
|
#define AQ_CFG_DRV_VERSION_SUFFIX "-kern"
|
|
|
|
#endif /* VER_H */
|
|
--
|
|
2.13.6
|
|
|