---

yaml --- r: 368430 b: refs/heads/master c: 93d08f0 h: refs/heads/master v: v3
git-mirror · Mar 6, 2013 · 340ba5f · 340ba5f
1 parent 7c1a9f9
commit 340ba5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;