diff --git a/[refs] b/[refs]
index 0033dba8e046..c4cd909bb47f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90fcba65d29e3fc35847a5bb46ecaa87ab412685
+refs/heads/master: 93d08f0b785dd3878a3b84a9013a15e57e6b4344
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 08de0c6035f1..7469020175d5 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -4051,6 +4051,7 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
 			return -EINVAL;
 		break;
 	case NL80211_IFTYPE_STATION:
+	case NL80211_IFTYPE_P2P_CLIENT:
 		/* ignore uAPSD data */
 		params.sta_modify_mask &= ~STATION_PARAM_APPLY_UAPSD;