CHROMIUM: iwl7000: chromeOS: don't backport nla_put_u64_64bit() for chromeos-4.4
Kirtika has backported the patch that introduces the
nla_put_u64_64bit() function, so we can't backport it anymore.
Surround the definition with an ifdef for that purpose.
Change-Id: I22a58b1f8381ac9fd438259a1f53e0e874217429
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
iwl7000-tree: bb2e08e9ab45bf8520fe6a5f2b2356fb91e63640
diff --git a/drivers/net/wireless/iwl7000/hdrs/iwl-chrome.h b/drivers/net/wireless/iwl7000/hdrs/iwl-chrome.h
index 416affa..e52d9824 100644
--- a/drivers/net/wireless/iwl7000/hdrs/iwl-chrome.h
+++ b/drivers/net/wireless/iwl7000/hdrs/iwl-chrome.h
@@ -456,6 +456,9 @@
#endif /* < 4.6 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0) || \
+ LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0))
/* We don't really care much about alignment, since nl80211 isn't using
* this for hot paths. So just implement it using nla_put_u64().
*/
@@ -464,6 +467,8 @@
{
return nla_put_u64(skb, attrtype, value);
}
+#endif /* < 4.4 && > 4.5 */
+
#define nla_put_s64 iwl7000_nla_put_s64
static inline int nla_put_s64(struct sk_buff *skb, int attrtype, s64 value,
int padattr)
