Merge "ath10k: enable gtk offload for the wcn3990 wlan module" (99c39f9b) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/wireless/ath/ath10k/core.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -433,6 +433,7 @@ struct ath10k_vif {
		struct cfg80211_bitrate_mask bitrate_mask;
		struct wmi_ns_arp_offload_req arp_offload;
		struct wmi_ns_arp_offload_req ns_offload;
		struct wmi_gtk_rekey_data gtk_rekey_data;
		};

		struct ath10k_vif_iter {

drivers/net/wireless/ath/ath10k/mac.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -7583,6 +7583,7 @@ static const struct ieee80211_ops ath10k_ops = {
		.suspend = ath10k_wow_op_suspend,
		.resume = ath10k_wow_op_resume,
		.set_wakeup = ath10k_wow_op_set_wakeup,
		.set_rekey_data = ath10k_wow_op_set_rekey_data,
		#endif
		#ifdef CONFIG_MAC80211_DEBUGFS
		.sta_add_debugfs = ath10k_sta_add_debugfs,

drivers/net/wireless/ath/ath10k/wmi-ops.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,8 @@ struct wmi_ops {
		const struct wmi_sta_keepalive_arg *arg);
		struct sk_buff (gen_set_arp_ns_offload)(struct ath10k *ar,
		struct ath10k_vif *arvif);
		struct sk_buff (gen_gtk_offload)(struct ath10k *ar,
		struct ath10k_vif *arvif);
		struct sk_buff (gen_wow_enable)(struct ath10k *ar);
		struct sk_buff (gen_wow_add_wakeup_event)(struct ath10k *ar, u32 vdev_id,
		enum wmi_wow_wakeup_event event,
		@@ -1205,6 +1207,23 @@ ath10k_wmi_set_arp_ns_offload(struct ath10k ar, struct ath10k_vif arvif)
		return ath10k_wmi_cmd_send(ar, skb, cmd_id);
		}

		static inline int
		ath10k_wmi_gtk_offload(struct ath10k ar, struct ath10k_vif arvif)
		{
		struct sk_buff *skb;
		u32 cmd_id;

		if (!ar->wmi.ops->gen_gtk_offload)
		return -EOPNOTSUPP;

		skb = ar->wmi.ops->gen_gtk_offload(ar, arvif);
		if (IS_ERR(skb))
		return PTR_ERR(skb);

		cmd_id = ar->wmi.cmd->gtk_offload_cmdid;
		return ath10k_wmi_cmd_send(ar, skb, cmd_id);
		}

		static inline int
		ath10k_wmi_wow_enable(struct ath10k *ar)
		{

drivers/net/wireless/ath/ath10k/wmi-tlv.c

+35 −0

Original line number	Diff line number	Diff line
		@@ -3014,6 +3014,40 @@ ath10k_wmi_tlv_op_gen_tdls_peer_update(struct ath10k *ar,
		return skb;
		}

		static struct sk_buff *
		ath10k_wmi_op_gen_gtk_offload(struct ath10k ar, struct ath10k_vif arvif)
		{
		struct wmi_tlv_gtk_offload_cmd *cmd;
		struct wmi_tlv *tlv;
		struct sk_buff *skb;
		struct wmi_gtk_rekey_data *rekey_data = &arvif->gtk_rekey_data;
		int len;

		len = sizeof(cmd) + sizeof(tlv);
		skb = ath10k_wmi_alloc_skb(ar, len);
		if (!skb)
		return ERR_PTR(-ENOMEM);

		tlv = (void *)skb->data;
		tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_GTK_OFFLOAD_CMD);
		tlv->len = __cpu_to_le16(sizeof(*cmd));
		cmd = (void *)tlv->value;
		if (rekey_data->enable_offload) {
		cmd->vdev_id = __cpu_to_le32(arvif->vdev_id);
		cmd->flags \|= __cpu_to_le32(WMI_GTK_OFFLOAD_ENABLE_OPCODE);
		memcpy(cmd->kek, rekey_data->kek, NL80211_KEK_LEN);
		memcpy(cmd->kck, rekey_data->kck, NL80211_KCK_LEN);
		cmd->replay_ctr = __cpu_to_le64(rekey_data->replay_ctr);
		} else {
		cmd->vdev_id = __cpu_to_le32(arvif->vdev_id);
		cmd->flags \|= __cpu_to_le32(WMI_GTK_OFFLOAD_DISABLE_OPCODE);
		}

		ath10k_dbg(ar, ATH10K_DBG_WMI,
		"wmi GTK offload for vdev: %d\n", arvif->vdev_id);
		return skb;
		}

		static struct sk_buff *
		ath10k_wmi_tlv_op_gen_set_arp_ns_offload(struct ath10k *ar,
		struct ath10k_vif *arvif)
		@@ -3778,6 +3812,7 @@ static const struct wmi_ops wmi_tlv_ops = {
		.gen_vdev_sta_uapsd = ath10k_wmi_tlv_op_gen_vdev_sta_uapsd,
		.gen_sta_keepalive = ath10k_wmi_tlv_op_gen_sta_keepalive,
		.gen_set_arp_ns_offload = ath10k_wmi_tlv_op_gen_set_arp_ns_offload,
		.gen_gtk_offload = ath10k_wmi_op_gen_gtk_offload,
		.gen_wow_enable = ath10k_wmi_tlv_op_gen_wow_enable,
		.gen_wow_add_wakeup_event = ath10k_wmi_tlv_op_gen_wow_add_wakeup_event,
		.gen_wow_host_wakeup_ind = ath10k_wmi_tlv_gen_wow_host_wakeup_ind,

drivers/net/wireless/ath/ath10k/wmi-tlv.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -1567,6 +1567,14 @@ struct wmi_tlv_arp_ns_offload_cmd {
		__le32 num_ns_ext_tuples;
		} __packed;

		struct wmi_tlv_gtk_offload_cmd {
		__le32 vdev_id;
		__le32 flags;
		u8 kek[NL80211_KEK_LEN];
		u8 kck[NL80211_KCK_LEN];
		__le64 replay_ctr;
		} __packed;

		struct wmi_tlv_wow_host_wakeup_ind {
		__le32 reserved;
		} __packed;