diff options
| author | Eliad Peller <eliad@wizery.com> | 2014-06-11 10:23:35 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-10-29 09:29:02 +0100 |
| commit | 84197d64c418b1b9fb9512defa61f57411df1989 (patch) | |
| tree | e09e27d64ec51a5a07118a5c306b7696901b17cd /include | |
| parent | 6fd64e7d017a6355e2debeaf5ceb61c2a4c407e1 (diff) | |
regulatory: fix misapplied alpha2 fix
Upstream commit a5fe8e7695dc3f547e955ad2b662e3e72969e506 (regulatory:
add NUL to alpha2) contained a hunk that was supposed to be applied to
struct ieee80211_reg_rule. However in stable 3.12 (3.12.31 in
particular), it ended up in struct regulatory_request. Fix that now.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Eliad Peller <eliadx.peller@intel.com>
Cc: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/regulatory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/regulatory.h b/include/net/regulatory.h index 23a019668705..3e827aad1ec6 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -78,7 +78,7 @@ struct regulatory_request { int wiphy_idx; enum nl80211_reg_initiator initiator; enum nl80211_user_reg_hint_type user_reg_hint_type; - char alpha2[3]; + char alpha2[2]; u8 dfs_region; bool intersect; bool processed; @@ -106,7 +106,7 @@ struct ieee80211_reg_rule { struct ieee80211_regdomain { struct rcu_head rcu_head; u32 n_reg_rules; - char alpha2[2]; + char alpha2[3]; u8 dfs_region; struct ieee80211_reg_rule reg_rules[]; }; |