Commit 3b77d5ec authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

cfg80211: relicense reg.c reg.h and genregdb.awk to ISC 

Following the tradition we have had with ath5k, ath9k, CRDA,
wireless-regdb I'd like to license this code under the permissive ISC
license for the code sharing purposes with other OSes, it'd sure be nice
to help the landscape in this area. Although I am %82.89 owner of the
regulatory code I have asked every contributor to the regulatory code
and have receieved positive Acked-bys from everyone except two deceased
entities:

 o Frans Pop RIP 2010 [0]
	- Frans Pop <elendil@planet.nl>
	- Frans Pop <fjp@debian.org>
 o Nokia     RIP February, 11, 2011 [1], [2]
	- ext-yuri.ershov@nokia.com
	- kalle.valo@nokia.com

Frans Pop's contribution was a simple patch 55f98938, titled,
"wireless: remove trailing space in messages" which just add a \n
to some printk lines. I'm going to treat these additions as
uncopyrightable.

As for the contributions made by employees on behalf of Nokia
my contact point was Petri Karhula <petri.karhula@nokia.com> but
after one month he noted he had not been able to get traction from the
legal department on this request, as such it I proceeded by replacing
their contributions in previous patches.

The end goal is to help a clean rewrite that starts in userspace
that is shared under ISC license which currently is taking place with
the regulatory simulator [3].

[0] http://lists.debian.org/debian-devel/2011/12/msg00263.html
[1] http://press.nokia.com/2011/02/11/nokia-outlines-new-strategy-introduces-new-leadership-operational-structure/
[2] http://NokiaPlanB.com
[3] git://github.com/mcgrof/regsim.git



Acked-by: default avatarThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Acked-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarMihai Moldovan <ionic@ionic.de>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarSven Neumann <s.neumann@raumfeld.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Acked-by: default avatarTony Vroon <tony@linx.net>
Acked-by: default avatarPavel Roskin <proski@gnu.org>
Acked-by: default avatarBob Copeland <me@bobcopeland.com>
Acked-by: default avatarLucas De Marchi <lucas.demarchi@profusion.mobi>
Acked-by: default avatarPat Erley <pat-lkml@erley.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Acked-by: default avatarChris Wright <chrisw@sous-sol.org>
Acked-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: default avatarJohn Gordon <john@devicescape.com>
Acked-by: default avatarSimon Barber <protocolmagic@gmail.com>
Acked-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Acked-by: default avatarJiri Benc <jbenc@upir.cz>
Acked-by: default avatarBruno Randolf <br1@einfach.org>
Acked-by: default avatarScott James Remnant <keybuk@google.com>
Acked-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6653325a

net/wireless/genregdb.awk

+10 −3
Original line number Diff line number Diff line
@@ -7,10 +7,17 @@ 
#

# Copyright 2009 John W. Linville <linville@tuxdriver.com>

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License version 2 as

# published by the Free Software Foundation.

# Permission to use, copy, modify, and/or distribute this software for any

# purpose with or without fee is hereby granted, provided that the above

# copyright notice and this permission notice appear in all copies.

#

# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



BEGIN {

	active = 0

net/wireless/reg.c

+13 −4
Original line number Diff line number Diff line
@@ -2,13 +2,22 @@ 
 * Copyright 2002-2005, Instant802 Networks, Inc.

 * Copyright 2005-2006, Devicescape Software, Inc.

 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2008	Luis R. Rodriguez <lrodriguz@atheros.com>

 * Copyright 2008-2011	Luis R. Rodriguez <mcgrof@qca.qualcomm.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */





/**

 * DOC: Wireless regulatory infrastructure

 *

net/wireless/reg.h

+15 −0
Original line number Diff line number Diff line 
#ifndef __NET_WIRELESS_REG_H

#define __NET_WIRELESS_REG_H

/*

 * Copyright 2008-2011	Luis R. Rodriguez <mcgrof@qca.qualcomm.com>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



extern const struct ieee80211_regdomain *cfg80211_regdomain;

net/wireless/regdb.h

+16 −0
Original line number Diff line number Diff line 
#ifndef __REGDB_H__

#define __REGDB_H__



/*

 * Copyright 2009 John W. Linville <linville@tuxdriver.com>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



extern const struct ieee80211_regdomain *reg_regdb[];

extern int reg_regdb_size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE