Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b3eb77 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-for-davem-20170126' 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

 - ignore self-generated loop detect MAC addresses in translation table,
   by Simon Wunderlich

 - install uapi batman_adv.h header, by Sven Eckelmann

 - bump copyright years, by Sven Eckelmann

 - Remove an unused variable in translation table code, by Sven Eckelmann

 - Handle NET_XMIT_CN like NET_XMIT_SUCCESS (revised according to Davids
   suggestion), and a follow up code clean up, by Gao Feng (2 patches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 27d80718 c3370518

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ header-y += auto_fs.h 
header-y += auxvec.h

header-y += ax25.h

header-y += b1lli.h

header-y += batman_adv.h

header-y += baycom.h

header-y += bcm933xx_hcs.h

header-y += bfs_fs.h

include/uapi/linux/batman_adv.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2016 B.A.T.M.A.N. contributors:

/* Copyright (C) 2016-2017  B.A.T.M.A.N. contributors:

 *

 * Matthias Schiffer

 *

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Copyright (C) 2007-2016  B.A.T.M.A.N. contributors:

# Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

#

net/batman-adv/bat_algo.c

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2007-2016  B.A.T.M.A.N. contributors:

/* Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *

net/batman-adv/bat_algo.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2011-2016  B.A.T.M.A.N. contributors:

/* Copyright (C) 2011-2017  B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Linus Lüssing

 *