1 files changed, 23 insertions, 19 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 35ca90667a59..180d80b37a8d 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -7,28 +7,32 @@
 * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
- * Redistribution and use in source and binary forms, with or without 
+ * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
- * Redistributions of source code must retain the above copyright notice, this 
+ * 1. Redistributions of source code must retain the above copyright
- * list of conditions and the following disclaimer.
+ *    notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, 
+ * 2. Redistributions in binary form must reproduce the above copyright
- * this list of conditions and the following disclaimer in the documentation 
+ *    notice, this list of conditions and the following disclaimer in the
- * and/or other materials provided with the distribution.
+ *    documentation and/or other materials provided with the distribution.
- * Neither the names of the copyright holders nor the names of its 
+ * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from this 
+ *    contributors may be used to endorse or promote products derived from
- * software without specific prior written permission.
+ *    this software without specific prior written permission.
 *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * Alternatively, this software may be distributed under the terms of the
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * GNU General Public License ("GPL") version 2 as published by the Free
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * Software Foundation.
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ *
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 35ca90667a59..180d80b37a8d 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c
@@ -7,28 +7,32 @@
7	* Copyright (c) 2005-2006, Ericsson AB	7	* Copyright (c) 2005-2006, Ericsson AB
8	* All rights reserved.	8	* All rights reserved.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions are met:	11	* modification, are permitted provided that the following conditions are met:
12	*	12	*
13	* Redistributions of source code must retain the above copyright notice, this	13	* 1. Redistributions of source code must retain the above copyright
14	* list of conditions and the following disclaimer.	14	* notice, this list of conditions and the following disclaimer.
15	* Redistributions in binary form must reproduce the above copyright notice,	15	* 2. Redistributions in binary form must reproduce the above copyright
16	* this list of conditions and the following disclaimer in the documentation	16	* notice, this list of conditions and the following disclaimer in the
17	* and/or other materials provided with the distribution.	17	* documentation and/or other materials provided with the distribution.
18	* Neither the names of the copyright holders nor the names of its	18	* 3. Neither the names of the copyright holders nor the names of its
19	* contributors may be used to endorse or promote products derived from this	19	* contributors may be used to endorse or promote products derived from
20	* software without specific prior written permission.	20	* this software without specific prior written permission.
21	*	21	*
22	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	22	* Alternatively, this software may be distributed under the terms of the
23	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	23	* GNU General Public License ("GPL") version 2 as published by the Free
24	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	24	* Software Foundation.
25	* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	25	*
26	* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	26	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
27	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	27	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
28	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	28	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
29	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	29	* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
30	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	30	* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	31	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		32	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		33	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		34	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		35	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32	* POSSIBILITY OF SUCH DAMAGE.	36	* POSSIBILITY OF SUCH DAMAGE.
33	*/	37	*/
34		38