From 91b2bc76c2f30d13d23a8617f453bb2841cbca06 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 10 Apr 2013 00:00:17 +0200 Subject: [PATCH] backports: fix module version Adding multiple MODULE_VERSION statements doesn't work on kernels before 3.8 (where __UNIQUE_ID was introduced) so just use a single line: $ /sbin/modinfo .../net/mac80211/mac80211.ko filename: .../net/mac80211/mac80211.ko license: GPL description: IEEE 802.11 subsystem version: backported from Linux (next-20130405-0-g7df052b) using backports 6648f05 srcversion: CD64527389072C2F603DD61 depends: cfg80211,compat vermagic: 3.8.0 SMP mod_unload modversions parm: max_nullfunc_tries:Maximum nullfunc tx tries before disconnecting (reason 4). (int) parm: max_probe_tries:Maximum probe tries before disconnecting (reason 4). (int) parm: probe_wait_ms:Maximum time(ms) to wait for probe response before disconnecting (reason 4). (int) parm: ieee80211_default_rc_algo:Default rate control algorithm for mac80211 to use (charp) Signed-off-by: Johannes Berg --- backport/include/linux/compat-2.6.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/backport/include/linux/compat-2.6.h b/backport/include/linux/compat-2.6.h index b19376b0f859..3b9a2fa86c5b 100644 --- a/backport/include/linux/compat-2.6.h +++ b/backport/include/linux/compat-2.6.h @@ -35,10 +35,9 @@ void backport_dependency_symbol(void); #define BACKPORT_MOD_VERSIONS MODULE_VERSION(BACKPORTS_GIT_TRACKED); #else #define BACKPORT_MOD_VERSIONS \ - MODULE_VERSION("backports: " BACKPORTS_VERSION); \ - MODULE_VERSION("backported from: " \ - BACKPORTED_KERNEL_NAME " (" \ - BACKPORTED_KERNEL_VERSION ")"); + MODULE_VERSION("backported from " BACKPORTED_KERNEL_NAME \ + " (" BACKPORTED_KERNEL_VERSION ")" \ + " using backports " BACKPORTS_VERSION); #endif #undef module_init -- 2.30.2