mac80211: fix linux 3.5 compatibility

SVN-Revision: 32449
owl
Felix Fietkau 2012-06-19 00:59:19 +00:00
parent 5e204a09cf
commit 431e612d9e
1 changed files with 5 additions and 6 deletions

View File

@ -270,7 +270,7 @@
__NL80211_STA_INFO_AFTER_LAST, __NL80211_STA_INFO_AFTER_LAST,
--- a/net/wireless/nl80211.c --- a/net/wireless/nl80211.c
+++ b/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; return false;
} }
@ -285,26 +285,25 @@
+ +
+ attr = nla_nest_start(msg, id); + attr = nla_nest_start(msg, id);
+ if (!attr) + if (!attr)
+ goto nla_put_failure; + return false;
+ +
+ for (i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) {
+ if (!(mask & BIT(i))) + if (!(mask & BIT(i)))
+ continue; + continue;
+ +
+ NLA_PUT_U8(msg, i, signal[i]); + if (nla_put_u8(msg, i, signal[i]))
+ return false;
+ } + }
+ +
+ nla_nest_end(msg, attr); + nla_nest_end(msg, attr);
+ +
+ return true; + return true;
+nla_put_failure:
+ return false;
+} +}
+ +
static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq, static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
int flags, int flags,
struct cfg80211_registered_device *rdev, 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: default:
break; break;
} }