提交 b2c44a53 编写于 作者: D David Howells 提交者: Sven Eckelmann

batman-adv: count_real_packets() in batman-adv assumes char is signed

count_real_packets() in batman-adv assumes char is signed, and returns -1
through it:

net/batman-adv/routing.c: In function 'receive_bat_packet':
net/batman-adv/routing.c:739: warning: comparison is always false due to limited range of data type

Use int instead.
Signed-off-by: NDavid Howells <dhowells@redhat.com>
[sven@narfation.org: Rebase on top of current version]
Signed-off-by: NSven Eckelmann <sven@narfation.org>
上级 db69ecfc
master alk-4.19.24 alk-4.19.30 alk-4.19.34 alk-4.19.36 alk-4.19.43 alk-4.19.48 alk-4.19.57 ck-4.19.67 ck-4.19.81 ck-4.19.91 github/fork/deepanshu1422/fix-typo-in-comment github/fork/haosdent/fix-typo linux-next v4.19.91 v4.19.90 v4.19.89 v4.19.88 v4.19.87 v4.19.86 v4.19.85 v4.19.84 v4.19.83 v4.19.82 v4.19.81 v4.19.80 v4.19.79 v4.19.78 v4.19.77 v4.19.76 v4.19.75 v4.19.74 v4.19.73 v4.19.72 v4.19.71 v4.19.70 v4.19.69 v4.19.68 v4.19.67 v4.19.66 v4.19.65 v4.19.64 v4.19.63 v4.19.62 v4.19.61 v4.19.60 v4.19.59 v4.19.58 v4.19.57 v4.19.56 v4.19.55 v4.19.54 v4.19.53 v4.19.52 v4.19.51 v4.19.50 v4.19.49 v4.19.48 v4.19.47 v4.19.46 v4.19.45 v4.19.44 v4.19.43 v4.19.42 v4.19.41 v4.19.40 v4.19.39 v4.19.38 v4.19.37 v4.19.36 v4.19.35 v4.19.34 v4.19.33 v4.19.32 v4.19.31 v4.19.30 v4.19.29 v4.19.28 v4.19.27 v4.19.26 v4.19.25 v4.19.24 v4.19.23 v4.19.22 v4.19.21 v4.19.20 v4.19.19 v4.19.18 v4.19.17 v4.19.16 v4.19.15 v4.19.14 v4.19.13 v4.19.12 v4.19.11 v4.19.10 v4.19.9 v4.19.8 v4.19.7 v4.19.6 v4.19.5 v4.19.4 v4.19.3 v4.19.2 v4.19.1 v4.19 v4.19-rc8 v4.19-rc7 v4.19-rc6 v4.19-rc5 v4.19-rc4 v4.19-rc3 v4.19-rc2 v4.19-rc1 ck-release-21 ck-release-20 ck-release-19.2 ck-release-19.1 ck-release-19 ck-release-18 ck-release-17.2 ck-release-17.1 ck-release-17 ck-release-16 ck-release-15.1 ck-release-15 ck-release-14 ck-release-13.2 ck-release-13 ck-release-12 ck-release-11 ck-release-10 ck-release-9 ck-release-7 alk-release-15 alk-release-14 alk-release-13.2 alk-release-13 alk-release-12 alk-release-11 alk-release-10 alk-release-9 alk-release-7
无相关合并请求
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/* returns true if the corresponding bit in the given seq_bits indicates true /* returns true if the corresponding bit in the given seq_bits indicates true
* and curr_seqno is within range of last_seqno */ * and curr_seqno is within range of last_seqno */
uint8_t get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno, int get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno,
uint32_t curr_seqno) uint32_t curr_seqno)
{ {
int32_t diff, word_offset, word_num; int32_t diff, word_offset, word_num;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/* returns true if the corresponding bit in the given seq_bits indicates true /* returns true if the corresponding bit in the given seq_bits indicates true
* and curr_seqno is within range of last_seqno */ * and curr_seqno is within range of last_seqno */
uint8_t get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno, int get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno,
uint32_t curr_seqno); uint32_t curr_seqno);
/* turn corresponding bit on, so we can remember that we got the packet */ /* turn corresponding bit on, so we can remember that we got the packet */
......
...@@ -361,7 +361,7 @@ static void update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, ...@@ -361,7 +361,7 @@ static void update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node,
const struct batman_packet *batman_packet, const struct batman_packet *batman_packet,
struct hard_iface *if_incoming, struct hard_iface *if_incoming,
const unsigned char *tt_buff, int tt_buff_len, const unsigned char *tt_buff, int tt_buff_len,
char is_duplicate) int is_duplicate)
{ {
struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL; struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
struct neigh_node *router = NULL; struct neigh_node *router = NULL;
...@@ -528,7 +528,7 @@ static int window_protected(struct bat_priv *bat_priv, ...@@ -528,7 +528,7 @@ static int window_protected(struct bat_priv *bat_priv,
* -1 the packet is old and has been received while the seqno window * -1 the packet is old and has been received while the seqno window
* was protected. Caller should drop it. * was protected. Caller should drop it.
*/ */
static char count_real_packets(const struct ethhdr *ethhdr, static int count_real_packets(const struct ethhdr *ethhdr,
const struct batman_packet *batman_packet, const struct batman_packet *batman_packet,
const struct hard_iface *if_incoming) const struct hard_iface *if_incoming)
{ {
...@@ -536,7 +536,7 @@ static char count_real_packets(const struct ethhdr *ethhdr, ...@@ -536,7 +536,7 @@ static char count_real_packets(const struct ethhdr *ethhdr,
struct orig_node *orig_node; struct orig_node *orig_node;
struct neigh_node *tmp_neigh_node; struct neigh_node *tmp_neigh_node;
struct hlist_node *node; struct hlist_node *node;
char is_duplicate = 0; int is_duplicate = 0;
int32_t seq_diff; int32_t seq_diff;
int need_update = 0; int need_update = 0;
int set_mark, ret = -1; int set_mark, ret = -1;
...@@ -605,7 +605,7 @@ void receive_bat_packet(const struct ethhdr *ethhdr, ...@@ -605,7 +605,7 @@ void receive_bat_packet(const struct ethhdr *ethhdr,
char has_directlink_flag; char has_directlink_flag;
char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
char is_broadcast = 0, is_bidirectional, is_single_hop_neigh; char is_broadcast = 0, is_bidirectional, is_single_hop_neigh;
char is_duplicate; int is_duplicate;
uint32_t if_incoming_seqno; uint32_t if_incoming_seqno;
/* Silently drop when the batman packet is actually not a /* Silently drop when the batman packet is actually not a
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部