--- deb	2015-08-03 20:25:19.539900552 +0300
+++ ubu	2015-07-18 00:59:22.000000000 +0300
@@ -504,3 +504,12 @@
 
 # XXX: Debian #678147
 CONFIG_IBSS_RSN=y
+
+# P2P support
+CONFIG_P2P=y
+
+# AP-mode support (ad-hoc via infrastructure-type)
+CONFIG_AP=y
+
+# Ubuntu-specific; from path android_hal_firmware_path.patch
+CONFIG_ANDROID_HAL=y