From 7bb61858bc5b72e9f9e8b2dcb098347620d83ed1 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 20 Jan 2012 13:52:37 +0100 Subject: [PATCH] --- yaml --- r: 289987 b: refs/heads/master c: 2da8f419e78a0ebccc91c095328278fe668a7932 h: refs/heads/master i: 289985: 05aa20eebdec4deca7a526ad812063784cd8e557 289983: 85c143d0b3bf19d51c1e6202e46c5c0542ba0de7 v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 68aaf0317a2d..720df624e29e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e7c4e4dc6e98a0d3ee4535c6b94a3ad63adad2a +refs/heads/master: 2da8f419e78a0ebccc91c095328278fe668a7932 diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index afeea32e04ad..5cefd74ab47d 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -427,10 +427,9 @@ static int nl80211_parse_key_new(struct nlattr *key, struct key_parse *k) if (tb[NL80211_KEY_DEFAULT_TYPES]) { struct nlattr *kdt[NUM_NL80211_KEY_DEFAULT_TYPES]; - int err = nla_parse_nested(kdt, - NUM_NL80211_KEY_DEFAULT_TYPES - 1, - tb[NL80211_KEY_DEFAULT_TYPES], - nl80211_key_default_policy); + err = nla_parse_nested(kdt, NUM_NL80211_KEY_DEFAULT_TYPES - 1, + tb[NL80211_KEY_DEFAULT_TYPES], + nl80211_key_default_policy); if (err) return err; @@ -4781,7 +4780,6 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) nla_len(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]); struct ieee80211_supported_band *sband = wiphy->bands[ibss.channel->band]; - int err; err = ieee80211_get_ratemask(sband, rates, n_rates, &ibss.basic_rates);