forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/net/wireless/marvell/mwifiex/tdls.c
....@@ -735,6 +735,7 @@
735735 	int ret;
736736 	u16 capab;
737737 	struct ieee80211_ht_cap *ht_cap;
738
+	unsigned int extra;
738739 	u8 radio, *pos;
739740 
740741 	capab = priv->curr_bss_params.bss_descriptor.cap_info_bitmap;
....@@ -753,7 +754,10 @@
753754 
754755 	switch (action_code) {
755756 	case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
756
-		skb_put(skb, sizeof(mgmt->u.action.u.tdls_discover_resp) + 1);
757
+		/* See the layout of 'struct ieee80211_mgmt'. */
758
+		extra = sizeof(mgmt->u.action.u.tdls_discover_resp) +
759
+			sizeof(mgmt->u.action.category);
760
+		skb_put(skb, extra);
757761 		mgmt->u.action.category = WLAN_CATEGORY_PUBLIC;
758762 		mgmt->u.action.u.tdls_discover_resp.action_code =
759763 					      WLAN_PUB_ACTION_TDLS_DISCOVER_RES;
....@@ -762,8 +766,7 @@
762766 		mgmt->u.action.u.tdls_discover_resp.capability =
763767 							     cpu_to_le16(capab);
764768 		/* move back for addr4 */
765
-		memmove(pos + ETH_ALEN, &mgmt->u.action.category,
766
-			sizeof(mgmt->u.action.u.tdls_discover_resp));
769
+		memmove(pos + ETH_ALEN, &mgmt->u.action, extra);
767770 		/* init address 4 */
768771 		eth_broadcast_addr(pos);
769772