Linux v3.17-5503-g35a9ad8af0bb

1 files changed, 30 insertions, 0 deletions

diff --git a/config-generic b/config-generic
index 4ed0c0da1..2ce3c61e1 100644
--- a/config-generic
+++ b/config-generic
@@ -718,6 +718,7 @@ CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
 CONFIG_TCP_CONG_HYBLA=m
 CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_TCP_CONG_VEGAS=m
@@ -759,6 +760,8 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU=m
+CONFIG_GENEVE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -777,6 +780,7 @@ CONFIG_IP_VS_PROTO_UDP=y
 CONFIG_IP_VS_PROTO_ESP=y
 CONFIG_IP_VS_PROTO_AH=y
 CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_FO=m
 CONFIG_IP_VS_IPV6=y
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
@@ -1018,12 +1022,16 @@ CONFIG_NFT_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_MASQ_IPV6=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NF_TABLES_IPV4=m
+CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -1083,6 +1091,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
 CONFIG_IP_SET_HASH_IPPORT=m
 CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_MAC=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
@@ -1208,6 +1217,7 @@ CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=y
 CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_OPENVSWITCH_GENEVE=y
 CONFIG_VSOCKETS=m
 
 
@@ -1307,6 +1317,8 @@ CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_ADAPTEC_STARFIRE=m
 
+# CONFIG_NET_VENDOR_AGERE is not set
+
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -1322,6 +1334,7 @@ CONFIG_PCMCIA_NMCLAN=m
 
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC=m
+# CONFIG_EMAC_ROCKCHIP is not set
 
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ALX=m
@@ -1403,6 +1416,7 @@ CONFIG_I40E=m
 # CONFIG_I40E_VXLAN is not set
 # CONFIG_I40E_DCB is not set
 # CONFIG_I40EVF is not set
+CONFIG_FM10K=m
 
 
 # CONFIG_NET_VENDOR_I825XX is not set
@@ -1455,6 +1469,8 @@ CONFIG_QLCNIC_HWMON=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -1527,6 +1543,7 @@ CONFIG_DAVICOM_PHY=m
 CONFIG_DP83640_PHY=m
 CONFIG_FIXED_PHY=y
 CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_BCM63XX_PHY=m
@@ -1653,11 +1670,14 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 # CONFIG_ATH9K_STATION_STATISTICS is not set
 # CONFIG_ATH9K_WOW is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
 # 
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_TRACING is not set
+# CONFIG_ATH_TRACEPOINTS is not set
 CONFIG_ATH10K_DEBUGFS=y
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
@@ -1724,12 +1744,15 @@ CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_LIBERTAS_SPI is not set
 CONFIG_LIBERTAS_MESH=y
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_UAPSD is not set
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
+
 CONFIG_IWLEGACY=m
 CONFIG_IWLEGACY_DEBUG=y
 CONFIG_IWLEGACY_DEBUGFS=y
@@ -1737,6 +1760,7 @@ CONFIG_IWL4965=y
 CONFIG_IWL3945=m
 # CONFIG_IWM is not set
 # CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set
+
 CONFIG_MAC80211_HWSIM=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -1793,9 +1817,11 @@ CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTL8192DE=m
+CONFIG_RTL8192EE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8723BE=m
 CONFIG_RTL8188EE=m
+CONFIG_RTL8821AE=m
 
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
@@ -3742,6 +3768,7 @@ CONFIG_USB_S2255=m
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
 CONFIG_USB_ZR364XX=m
 # CONFIG_SOC_CAMERA is not set
+# CONFIG_SOC_TI is not set
 
 #
 # USB Network adaptors
@@ -4732,6 +4759,7 @@ CONFIG_LEDS_DELL_NETBOOKS=m
 # CONFIG_LEDS_PWM is not set
 # CONFIG_LEDS_LP8501 is not set
 # CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_SYSCON is not set
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
@@ -4927,6 +4955,8 @@ CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6131=m
 CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_NET_DSA_MV88E6171=m
+CONFIG_NET_DSA_BCM_SF2=m
 
 # Used by Maemo, we don't care.
 # CONFIG_PHONET is not set