1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c
index 922e3d69fd84..75cbd609d606 100644
--- a/drivers/net/wireless/marvell/mwifiex/ie.c
+++ b/drivers/net/wireless/marvell/mwifiex/ie.c
@@ -349,13 +349,20 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
                 case WLAN_EID_SUPP_RATES:
                 case WLAN_EID_COUNTRY:
                 case WLAN_EID_PWR_CONSTRAINT:
+                case WLAN_EID_ERP_INFO:
                 case WLAN_EID_EXT_SUPP_RATES:
                 case WLAN_EID_HT_CAPABILITY:
                 case WLAN_EID_HT_OPERATION:
                 case WLAN_EID_VHT_CAPABILITY:
                 case WLAN_EID_VHT_OPERATION:
-                case WLAN_EID_VENDOR_SPECIFIC:
                         break;
+                case WLAN_EID_VENDOR_SPECIFIC:
+                        /* Skip only Microsoft WMM IE */
+                        if (cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
+                                                    WLAN_OUI_TYPE_MICROSOFT_WMM,
+                                                    (const u8 *)hdr,
+                                                    hdr->len + sizeof(struct ieee_types_header)))
+                                break;
                 default:
                         memcpy(gen_ie->ie_buffer + ie_len, hdr,
                                hdr->len + sizeof(struct ieee_types_header));