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