mac80211: fix linux 3.5 compatibility

SVN-Revision: 32449

diff --git a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
index 3b9cfe8752d04e5ff0e011a67240fdce478fe36c..ba1f9f0534c53b301706d5206c6e9abb0f39a46c 100644 (file)
--- a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
+++ b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
@@ -270,7 +270,7 @@
        __NL80211_STA_INFO_AFTER_LAST,
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -2553,6 +2553,33 @@ nla_put_failure:
+@@ -2553,6 +2553,32 @@ nla_put_failure:
        return false;
  }
  
@@ -285,26 +285,25 @@
 +
 +      attr = nla_nest_start(msg, id);
 +      if (!attr)
-+              goto nla_put_failure;
++              return false;
 +
 +      for (i = 0; i < 4; i++) {
 +              if (!(mask & BIT(i)))
 +                      continue;
 +
-+              NLA_PUT_U8(msg, i, signal[i]);
++              if (nla_put_u8(msg, i, signal[i]))
++                      return false;
 +      }
 +
 +      nla_nest_end(msg, attr);
 +
 +      return true;
-+nla_put_failure:
-+      return false;
 +}
 +
  static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
                                int flags,
                                struct cfg80211_registered_device *rdev,
-@@ -2614,6 +2641,18 @@ static int nl80211_send_station(struct s
+@@ -2614,6 +2640,18 @@ static int nl80211_send_station(struct s
        default:
                break;
        }