History

Merge tag 'batadv-next-for-davem-20171220' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - de-inline hash functions to save memory footprint, by Denys Vlasenko - Add License information to various files, by Sven Eckelmann (3 patches) - Change batman_adv.h from ISC to MIT, by Sven Eckelmann - Improve various includes, by Sven Eckelmann (5 patches) - Lots of kernel-doc work by Sven Eckelmann (8 patches) ====================

David S. Miller committed 8 years ago

Commit a943e8b2 parents b2597f7 ff15c2762 files · +2852 −1353Browse files

Showing the changes to include/uapi/linux (1 of 62 files). Show all

Unified · Split

include/uapi/linux/batman_adv.h+17−10
@@ -1,18 +1,25 @@
1/* SPDX-License-Identifier: MIT */
1/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:2/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
2 *3 *
3 * Matthias Schiffer4 * Matthias Schiffer
4 *5 *
5 * Permission to use, copy, modify, and/or distribute this software for any6 * Permission is hereby granted, free of charge, to any person obtaining a
6 * purpose with or without fee is hereby granted, provided that the above7 * copy of this software and associated documentation files (the "Software"),
7 * copyright notice and this permission notice appear in all copies.8 * to deal in the Software without restriction, including without limitation
9 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
10 * and/or sell copies of the Software, and to permit persons to whom the
11 * Software is furnished to do so, subject to the following conditions:
8 *12 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES13 * The above copyright notice and this permission notice shall be included in
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF14 * all copies or substantial portions of the Software.
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR15 *
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES16 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN17 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF18 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.19 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
22 * DEALINGS IN THE SOFTWARE.
16 */23 */
17 24
18#ifndef _UAPI_LINUX_BATMAN_ADV_H_25#ifndef _UAPI_LINUX_BATMAN_ADV_H_