1 files changed, 12 insertions, 8 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index eba88033b90e..73c6aa8fa1a3 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -9,14 +9,18 @@
 * 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.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

diff --git a/net/tipc/net.c b/net/tipc/net.c index eba88033b90e..73c6aa8fa1a3 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c
@@ -9,14 +9,18 @@
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	*
		21	* Alternatively, this software may be distributed under the terms of the
		22	* GNU General Public License ("GPL") version 2 as published by the Free
		23	* Software Foundation.
20	*	24	*
21	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	25	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
22	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	26	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE