v4.4-3408-g6799060

1 files changed, 43 insertions, 1 deletions

diff --git a/config-generic b/config-generic
index 391bd891a..390d82894 100644
--- a/config-generic
+++ b/config-generic
@@ -759,6 +759,8 @@ CONFIG_NETLINK_DIAG=m
 
 CONFIG_BPF_JIT=y
 
+CONFIG_INET_DIAG_DESTROY=y
+
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -1088,6 +1090,9 @@ CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
 
 CONFIG_NF_TABLES_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1496,6 +1501,7 @@ CONFIG_I40E=m
 CONFIG_I40E_VXLAN=y
 # CONFIG_I40E_DCB is not set
 # CONFIG_I40E_FCOE is not set
+CONFIG_I40E_GENEVE=y
 CONFIG_I40EVF=m
 CONFIG_FM10K=m
 # CONFIG_FM10K_VXLAN is not set
@@ -1525,6 +1531,10 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP_NETVF=m
+CONFIG_NFP_NET_DEBUG=n
+
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -1751,7 +1761,9 @@ CONFIG_MAC80211_DEBUGFS=y
 
 # CONFIG_WIMAX is not set
 
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
 # CONFIG_ADM8211 is not set
+CONFIG_WLAN_VENDOR_ATH=y
 CONFIG_ATH_COMMON=m
 CONFIG_ATH_CARDS=m
 CONFIG_ATH5K=m
@@ -1770,6 +1782,7 @@ CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_DEBUGFS=y
 CONFIG_ATH9K_HTC=m
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
+# CONFIG_ATH9K_HWRNG is not set
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 # CONFIG_ATH9K_STATION_STATISTICS is not set
 # CONFIG_ATH9K_WOW is not set
@@ -1791,9 +1804,13 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_HWRNG is not set
 CONFIG_AT76C50X_USB=m
+# CONFIG_WLAN_VENDOR_CISCO is not set
 # CONFIG_AIRO is not set
 # CONFIG_AIRO_CS is not set
+# CONFIG_WLAN_VENDOR_ATMEL is not set
 # CONFIG_ATMEL is not set
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
@@ -1830,6 +1847,7 @@ CONFIG_PCMCIA_HERMES=m
 CONFIG_ORINOCO_USB=m
 # CONFIG_TMD_HERMES is not set
 # CONFIG_PCMCIA_SPECTRUM is not set
+CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
@@ -1839,6 +1857,7 @@ CONFIG_CW1200_WLAN_SPI=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_LIBIPW_DEBUG is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@@ -1850,6 +1869,7 @@ CONFIG_LIBERTAS_MESH=y
 CONFIG_BNXT=m
 CONFIG_BNXT_SRIOV=y
 
+CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
@@ -1874,6 +1894,7 @@ CONFIG_P54_PCI=m
 CONFIG_MWL8K=m
 # CONFIG_PRISM54 is not set
 # CONFIG_PCMCIA_WL3501 is not set
+CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
 CONFIG_RSI_SDIO=m
@@ -1882,7 +1903,9 @@ CONFIG_RT2X00=m
 CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_WL_MEDIATEK=y
+CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_MT7601U=m
+CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
@@ -1902,6 +1925,7 @@ CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT73USB=m
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m
+CONFIG_WLAN_VENDOR_ZYDAS=y
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_RNDIS_WLAN=m
@@ -1913,13 +1937,20 @@ CONFIG_USB_NET_CH9200=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 
+CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL12XX=m
 
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WILINK_PLATFORM_DATA=y
+
 
 CONFIG_RTL_CARDS=m
+CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
@@ -1947,6 +1978,7 @@ CONFIG_IEEE802154_FAKELB=m
 CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_CC2520=m
 # CONFIG_IEEE802154_AT86RF230 is not set
+# CONFIG_IEEE802154_ADF7242 is not set
 # CONFIG_IEEE802154_MRF24J40 is not set
 # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -1967,7 +1999,13 @@ CONFIG_6LOWPAN_NHC_IPV6=m
 CONFIG_6LOWPAN_NHC_MOBILITY=m
 CONFIG_6LOWPAN_NHC_ROUTING=m
 CONFIG_6LOWPAN_NHC_UDP=m
-
+CONFIG_6LOWPAN_DEBUGFS=y
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
 
 #
 # Token Ring devices
@@ -2068,11 +2106,14 @@ CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_ST21NFCB is not set
 # CONFIG_NFC_ST21NFCB_I2C is not set
+# CONFIG_NFC_ST95HF is not set
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_NCI_SPI is not set
 # CONFIG_NFC_NCI_UART is not set
 # CONFIG_NFC_ST_NCI is not set
+# CONFIG_NFC_ST_NCI_I2C is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
+# CONFIG_NFC_ST_NCI_SPI is not set
 # CONFIG_NFC_FDP is not set
 # CONFIG_NFC_MRVL_I2C is not set
 # CONFIG_NFC_MRVL_SPI is not set
@@ -4413,6 +4454,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
+# CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_DNOTIFY=y
 # Autofsv3 is obsolete.
 # systemd is dependant upon AUTOFS, so build it in.