Merge "cnss_nl: Add new attributes for cld80211 attr list" (076e5d0e) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/cnss_genl/cnss_nl.c

+3 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. */
		/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */

		#include <net/genetlink.h>
		#include <net/cnss_nl.h>
		@@ -57,6 +57,8 @@ static const struct nla_policy cld80211_policy[CLD80211_ATTR_MAX + 1] = {
		.len = CLD80211_MAX_NL_DATA },
		[CLD80211_ATTR_META_DATA] = { .type = NLA_BINARY,
		.len = CLD80211_MAX_NL_DATA },
		[CLD80211_ATTR_CMD] = { .type = NLA_U32 },
		[CLD80211_ATTR_CMD_TAG_DATA] = { .type = NLA_NESTED },
		};

		static int cld80211_pre_doit(const struct genl_ops ops, struct sk_buff skb,

+7 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. */
		/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */

		#ifndef _NET_CNSS_GENETLINK_H_
		#define _NET_CNSS_GENETLINK_H_
		@@ -17,6 +17,10 @@
		* @CLD80211_ATTR_META_DATA: Embed meta data for above data. This will help
		* wlan driver to peek into request message packet without opening up definition
		* of complete request message.
		* @CLD80211_ATTR_CMD: cld80211 vendor subcommand in this attribute
		* @CLD80211_ATTR_CMD_TAG_DATA: cld80211 vendor subcommand data is present in
		* this attribute. It is a nested attribute with sub attributes of specified
		* vendor sub command.
		*
		* Any new message in future can be added as another attribute
		*/
		@@ -24,6 +28,8 @@ enum cld80211_attr {
		CLD80211_ATTR_VENDOR_DATA = 1,
		CLD80211_ATTR_DATA,
		CLD80211_ATTR_META_DATA,
		CLD80211_ATTR_CMD,
		CLD80211_ATTR_CMD_TAG_DATA,
		/* add new attributes above here */

		__CLD80211_ATTR_AFTER_LAST,