The following commit has been merged in the master branch: commit 8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3 Merge: 4e2fa6b902751da6e15ad1bc748a65498ed28c94 b2e55ca89245fccd459a2d56850822a69a6f91da Author: David S. Miller davem@davemloft.net Date: Wed Jan 15 23:04:04 2020 +0100
Merge tag 'batadv-next-for-davem-20200114' 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
- fix typo and kerneldocs, by Sven Eckelmann
- use WiFi txbitrate for B.A.T.M.A.N. V as fallback, by René Treffer
- silence some endian sparse warnings by adding annotations, by Sven Eckelmann
- Update copyright years to 2020, by Sven Eckelmann
- Disable deprecated sysfs configuration by default, by Sven Eckelmann ====================
Signed-off-by: David S. Miller davem@davemloft.net
diff --combined net/batman-adv/main.c index 4811ec65bc43,0b840e1e3dfa..d8a255c85e77 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@@ -1,5 -1,5 +1,5 @@@ // SPDX-License-Identifier: GPL-2.0 - /* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: + /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich */ @@@ -548,7 -548,7 +548,7 @@@ static void batadv_recv_handler_init(vo BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_change) != 12); BUILD_BUG_ON(sizeof(struct batadv_tvlv_roam_adv) != 8);
- i = FIELD_SIZEOF(struct sk_buff, cb); + i = sizeof_field(struct sk_buff, cb); BUILD_BUG_ON(sizeof(struct batadv_skb_cb) > i);
/* broadcast packet */