Page MenuHomeFreeBSD
Files F153502411

D43647.id133495.diff
No OneTemporary
Actions

D43647.id133495.diff
View Options

diff --git a/sys/contrib/dev/iwlwifi/fw/api/sta.h b/sys/contrib/dev/iwlwifi/fw/api/sta.h
--- a/sys/contrib/dev/iwlwifi/fw/api/sta.h
+++ b/sys/contrib/dev/iwlwifi/fw/api/sta.h
@@ -477,7 +477,11 @@
u8 decryption_type;
u8 flags;
u8 reserved;
+#if defined(__linux__)
struct iwl_mvm_wep_key wep_key[];
+#elif defined(__FreeBSD__)
+ struct iwl_mvm_wep_key wep_key[0];
+#endif
} __packed; /* SEC_CURR_WEP_KEY_CMD_API_S_VER_2 */
/**
diff --git a/sys/contrib/dev/iwlwifi/mvm/d3.c b/sys/contrib/dev/iwlwifi/mvm/d3.c
--- a/sys/contrib/dev/iwlwifi/mvm/d3.c
+++ b/sys/contrib/dev/iwlwifi/mvm/d3.c
@@ -7,6 +7,9 @@
#include <linux/etherdevice.h>
#include <linux/ip.h>
#include <linux/fs.h>
+#if defined(__FreeBSD__)
+#include <linux/string.h>
+#endif
#include <net/cfg80211.h>
#include <net/ipv6.h>
#include <net/tcp.h>
diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -3,6 +3,7 @@
.PATH: ${DEVIWLWIFIDIR}
+WITH_CONFIG_PM= 0
WITH_DEBUGFS= 0
KMOD= if_iwlwifi
@@ -36,6 +37,11 @@
CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS=${WITH_DEBUGFS}
CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS}
.endif
+.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0
+SRCS+= mvm/d3.c
+CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM}
+CFGLAS+= -DCONFIG_PM_SLEEP=${WITH_CONFIG_PM}
+.endif
SRCS+= iwl-devtrace.c
@@ -61,8 +67,6 @@
CFLAGS+= -DCONFIG_IWLWIFI_DEVICE_TRACING=1
#CFLAGS+= -DCONFIG_LOCKDEP=1
#CFLAGS+= -DCONFIG_NL80211_TESTMODE=1
-#CFLAGS+= -DCONFIG_PM=1
-#CFLAGS+= -DCONFIG_PM_SLEEP=1
#CFLAGS+= -DCONFIG_THERMAL=1
#CFLAGS+= -DCONFIG_EFI=1

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 12:09 PM (12 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31977841
Default Alt Text
D43647.id133495.diff (1 KB)

Event Timeline