projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'edac_for_4.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[firefly-linux-kernel-4.4.55.git]
/
net
/
batman-adv
/
main.h
diff --git
a/net/batman-adv/main.h
b/net/batman-adv/main.h
index bf0019a41a12337eb4dc8be4b81873bf18b23b1b..41d27c7872b9544f9f37928cdc493bfbdcec23a3 100644
(file)
--- a/
net/batman-adv/main.h
+++ b/
net/batman-adv/main.h
@@
-182,7
+182,7
@@
struct batadv_ogm_packet;
struct seq_file;
struct sk_buff;
-#define BATADV_PRINT_VID(vid) (
vid & BATADV_VLAN_HAS_TAG
? \
+#define BATADV_PRINT_VID(vid) (
(vid & BATADV_VLAN_HAS_TAG)
? \
(int)(vid & VLAN_VID_MASK) : -1)
extern char batadv_routing_algo[];