Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Just several instances of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 4 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 5782f718d567..46417f9cce68 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3568,16 +3568,16 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                 params.smps_mode = NL80211_SMPS_OFF;
         }
 
+        params.pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]);
+        if (params.pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ])
+                return -EOPNOTSUPP;
+
         if (info->attrs[NL80211_ATTR_ACL_POLICY]) {
                 params.acl = parse_acl_data(&rdev->wiphy, info);
                 if (IS_ERR(params.acl))
                         return PTR_ERR(params.acl);
         }
 
-        params.pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]);
-        if (params.pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ])
-                return -EOPNOTSUPP;
-
         wdev_lock(wdev);
         err = rdev_start_ap(rdev, dev, &params);
         if (!err) {
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 2443ee30ba5b..b7d1592bd5b8 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -721,6 +721,8 @@ __ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
          * alignment since sizeof(struct ethhdr) is 14.
          */
         frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + cur_len);
+        if (!frame)
+                return NULL;
 
         skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
         skb_copy_bits(skb, offset, skb_put(frame, cur_len), cur_len);