diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/genregdb.awk | 13 | ||||
-rw-r--r-- | net/wireless/reg.c | 17 | ||||
-rw-r--r-- | net/wireless/reg.h | 15 | ||||
-rw-r--r-- | net/wireless/regdb.h | 16 |
4 files changed, 54 insertions, 7 deletions
diff --git a/net/wireless/genregdb.awk b/net/wireless/genregdb.awk index 53c143f5e77..9392f8cbb90 100644 --- a/net/wireless/genregdb.awk +++ b/net/wireless/genregdb.awk | |||
@@ -7,10 +7,17 @@ | |||
7 | # | 7 | # |
8 | # Copyright 2009 John W. Linville <linville@tuxdriver.com> | 8 | # Copyright 2009 John W. Linville <linville@tuxdriver.com> |
9 | # | 9 | # |
10 | # This program is free software; you can redistribute it and/or modify | 10 | # Permission to use, copy, modify, and/or distribute this software for any |
11 | # it under the terms of the GNU General Public License version 2 as | 11 | # purpose with or without fee is hereby granted, provided that the above |
12 | # published by the Free Software Foundation. | 12 | # copyright notice and this permission notice appear in all copies. |
13 | # | 13 | # |
14 | # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
15 | # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
16 | # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
17 | # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
18 | # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
19 | # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
20 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
14 | 21 | ||
15 | BEGIN { | 22 | BEGIN { |
16 | active = 0 | 23 | active = 0 |
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index ef47b418c86..f65feaad155 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -2,13 +2,22 @@ | |||
2 | * Copyright 2002-2005, Instant802 Networks, Inc. | 2 | * Copyright 2002-2005, Instant802 Networks, Inc. |
3 | * Copyright 2005-2006, Devicescape Software, Inc. | 3 | * Copyright 2005-2006, Devicescape Software, Inc. |
4 | * Copyright 2007 Johannes Berg <johannes@sipsolutions.net> | 4 | * Copyright 2007 Johannes Berg <johannes@sipsolutions.net> |
5 | * Copyright 2008 Luis R. Rodriguez <lrodriguz@atheros.com> | 5 | * Copyright 2008-2011 Luis R. Rodriguez <mcgrof@qca.qualcomm.com> |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * Permission to use, copy, modify, and/or distribute this software for any |
8 | * it under the terms of the GNU General Public License version 2 as | 8 | * purpose with or without fee is hereby granted, provided that the above |
9 | * published by the Free Software Foundation. | 9 | * copyright notice and this permission notice appear in all copies. |
10 | * | ||
11 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
12 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
13 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
14 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
15 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
16 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
17 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
10 | */ | 18 | */ |
11 | 19 | ||
20 | |||
12 | /** | 21 | /** |
13 | * DOC: Wireless regulatory infrastructure | 22 | * DOC: Wireless regulatory infrastructure |
14 | * | 23 | * |
diff --git a/net/wireless/reg.h b/net/wireless/reg.h index 786e414afd9..e2aaaf525a2 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h | |||
@@ -1,5 +1,20 @@ | |||
1 | #ifndef __NET_WIRELESS_REG_H | 1 | #ifndef __NET_WIRELESS_REG_H |
2 | #define __NET_WIRELESS_REG_H | 2 | #define __NET_WIRELESS_REG_H |
3 | /* | ||
4 | * Copyright 2008-2011 Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | ||
5 | * | ||
6 | * Permission to use, copy, modify, and/or distribute this software for any | ||
7 | * purpose with or without fee is hereby granted, provided that the above | ||
8 | * copyright notice and this permission notice appear in all copies. | ||
9 | * | ||
10 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
11 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
12 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
13 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
14 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
15 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
16 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
17 | */ | ||
3 | 18 | ||
4 | extern const struct ieee80211_regdomain *cfg80211_regdomain; | 19 | extern const struct ieee80211_regdomain *cfg80211_regdomain; |
5 | 20 | ||
diff --git a/net/wireless/regdb.h b/net/wireless/regdb.h index 818222c9251..3279cfcefb0 100644 --- a/net/wireless/regdb.h +++ b/net/wireless/regdb.h | |||
@@ -1,6 +1,22 @@ | |||
1 | #ifndef __REGDB_H__ | 1 | #ifndef __REGDB_H__ |
2 | #define __REGDB_H__ | 2 | #define __REGDB_H__ |
3 | 3 | ||
4 | /* | ||
5 | * Copyright 2009 John W. Linville <linville@tuxdriver.com> | ||
6 | * | ||
7 | * Permission to use, copy, modify, and/or distribute this software for any | ||
8 | * purpose with or without fee is hereby granted, provided that the above | ||
9 | * copyright notice and this permission notice appear in all copies. | ||
10 | * | ||
11 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
12 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
13 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
14 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
15 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
16 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
17 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
18 | */ | ||
19 | |||
4 | extern const struct ieee80211_regdomain *reg_regdb[]; | 20 | extern const struct ieee80211_regdomain *reg_regdb[]; |
5 | extern int reg_regdb_size; | 21 | extern int reg_regdb_size; |
6 | 22 | ||