summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c6
-rw-r--r--net/wireless/scan.c3
-rw-r--r--net/wireless/util.c6
3 files changed, 7 insertions, 8 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f29acf851376..e7dd32880598 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -9028,10 +9028,8 @@ static int nl80211_dump_station(struct sk_buff *skb,
/* this fails if the wdev is being removed */
wdev = __nl80211_lock_held_wdev(rdev, netns,
wdev);
- if (IS_ERR(wdev)) {
- err = PTR_ERR(wdev);
- goto out_err;
- }
+ if (IS_ERR(wdev))
+ return PTR_ERR(wdev);
/* try again locked now */
locked = true;
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index ac56338f0f43..1c50a16c0e9b 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -2453,6 +2453,7 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy,
if (cfg80211_add_nontrans_list(data->source_bss, &res->pub)) {
if (__cfg80211_unlink_bss(rdev, res)) {
rdev->bss_generation++;
+ bss_ref_put(rdev, res);
res = NULL;
}
}
@@ -2592,7 +2593,7 @@ cfg80211_parse_mbssid_data(struct wiphy *wiphy,
if (elem->data[0] < 1 || (int)elem->data[0] > 8)
continue;
for_each_element(sub, elem->data + 1, elem->datalen - 1) {
- u8 profile_len;
+ size_t profile_len;
if (sub->id != 0 || sub->datalen < 4) {
/* not a valid BSS profile */
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 59912f4a93c8..ebb1f6ec7efc 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -863,12 +863,12 @@ __ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
return frame;
}
-static u16
+static unsigned int
ieee80211_amsdu_subframe_length(void *field, u8 mesh_flags, u8 hdr_type)
{
__le16 *field_le = field;
__be16 *field_be = field;
- u16 len;
+ unsigned int len;
if (hdr_type >= 2)
len = le16_to_cpu(*field_le);
@@ -890,7 +890,7 @@ bool ieee80211_is_valid_amsdu(struct sk_buff *skb, u8 mesh_hdr)
__be16 len;
u8 mesh_flags;
} hdr;
- u16 len;
+ unsigned int len;
if (sizeof(hdr) > remaining)
return false;