diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-06-19 00:59:19 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-19 00:59:19 +0000 |
| commit | cd33136f93f4a0862ee3e89dd09707195002f811 (patch) | |
| tree | 5bdb7dbd0679400236cbc9820e4b9bee79697cad | |
| parent | 2771a8ce168b94e443f44edc97eeb2dce6b096eb (diff) | |
| download | master-187ad058-cd33136f93f4a0862ee3e89dd09707195002f811.tar.gz master-187ad058-cd33136f93f4a0862ee3e89dd09707195002f811.tar.bz2 master-187ad058-cd33136f93f4a0862ee3e89dd09707195002f811.zip | |
mac80211: fix linux 3.5 compatibility
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32449 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch | 11 |
1 files changed, 5 insertions, 6 deletions
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 3b9cfe8752..ba1f9f0534 100644 --- 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; } |