Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b142d80 authored Jun 24, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jun 24, 2015

Merge "cnss: Refactor PreAlloc Driver for CLD Architecture"

parents ceeee6ff d189cf5f

drivers/net/wireless/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -62,4 +62,6 @@ obj-$(CONFIG_CW1200) += cw1200/
		obj-$(CONFIG_RSI_91X) += rsi/

		obj-$(CONFIG_WCNSS_CORE) += wcnss/

		obj-$(CONFIG_CNSS) += cnss/
		obj-$(CONFIG_WCNSS_MEM_PRE_ALLOC) += cnss_prealloc/

drivers/net/wireless/cnss/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,3 @@

		cnsscore-objs += cnss.o ../wcnss/qcomwlan_secif.o
		obj-$(CONFIG_CNSS) += cnsscore.o
		obj-$(CONFIG_WCNSS_MEM_PRE_ALLOC) += ../wcnss/wcnss_prealloc.o

drivers/net/wireless/cnss/cnss.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,10 @@
		#include <soc/qcom/memory_dump.h>
		#include <net/cnss.h>

		#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
		#include <net/cnss_prealloc.h>
		#endif

		#define subsys_to_drv(d) container_of(d, struct cnss_data, subsys_desc)

		#define VREG_ON 1

drivers/net/wireless/cnss_prealloc/Makefile

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		obj-$(CONFIG_WCNSS_MEM_PRE_ALLOC) += cnss_prealloc.o

drivers/net/wireless/wcnss/wcnss_prealloc.c→drivers/net/wireless/cnss_prealloc/cnss_prealloc.c

+1 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012,2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012,2014-2015 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and