batctl: Merge bugfixes from v2017.4
[feed/routing.git] / batctl / patches / 0011-batctl-tcpdump-Fix-types-for-for-TT-v1.patch
1 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
2 Date: Thu, 23 Nov 2017 15:04:43 +0100
3 Subject: [PATCH] batctl: tcpdump: Fix types for for TT v1
4
5 The num_entry and num_vlan variables are accessed (printed) as u16
6 variables and not like integers. They should therefore also be stored like
7 that.
8
9 Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
10 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
11
12 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/15a1335cadacc7c3bb4723a30617d123a961a311
13 ---
14 tcpdump.c | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17 diff --git a/tcpdump.c b/tcpdump.c
18 index db9c46afecf3de94dbd4d9292df1fe0812fb8bfc..da5541ea9f5f9f9b6fd0838d2242daa22d41a28d 100644
19 --- a/tcpdump.c
20 +++ b/tcpdump.c
21 @@ -157,7 +157,8 @@ static void batctl_tvlv_parse_tt_v1(void *buff, ssize_t buff_len)
22 {
23 struct batadv_tvlv_tt_data *tvlv = buff;
24 struct batadv_tvlv_tt_vlan_data *vlan;
25 - int i, num_vlan, num_entry;
26 + int i;
27 + unsigned short num_vlan, num_entry;
28 const char *type;
29 size_t vlan_len;
30