The following commit has been merged in the master branch:
commit 4c18c425b2d228415b635e97a64737d7f27c5536
Author: Antonio Quartulli <antonio(a)open-mesh.com>
Date: Wed Sep 11 19:14:44 2013 +0200
batman-adv: set the TAG flag for the vid passed to BLA
When receiving or sending a packet a packet on a VLAN, the
vid has to be marked with the TAG flag in order to make any
component in batman-adv understand that the packet is coming
from a really tagged network.
This fix the Bridge Loop Avoidance behaviour which was not
able to send announces over VLAN interfaces.
Introduced by 0b1da1765fdb00ca5d53bc95c9abc70dfc9aae5b
("batman-adv: change VID semantic in the BLA code")
Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.org>
Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 4493913..813db4e 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -168,6 +168,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
case ETH_P_8021Q:
vhdr = (struct vlan_ethhdr *)skb->data;
vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
+ vid |= BATADV_VLAN_HAS_TAG;
if (vhdr->h_vlan_encapsulated_proto != ethertype)
break;
@@ -331,6 +332,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
case ETH_P_8021Q:
vhdr = (struct vlan_ethhdr *)skb->data;
vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
+ vid |= BATADV_VLAN_HAS_TAG;
if (vhdr->h_vlan_encapsulated_proto != ethertype)
break;
--
LinuxNextTracking
Name of failed tests
====================
sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.0 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.0 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.0 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.0 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.1 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.1 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.1 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.1 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.10 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.10 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.10 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.10 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.2 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.2 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.2 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.2 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.3 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.3 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.3 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.3 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.4 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.4 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.4 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.4 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.6 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.6 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.7 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.7 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.7 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.7 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.8 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.8 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.8 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.8 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.9 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.9 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n
sparse master linux-3.9 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
sparse master linux-3.9 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y
Output of different failed tests
================================
sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.9e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.9e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.9e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.9e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.9e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.8e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.2e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.2e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.2e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.2e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.2e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.1e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.5e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.5e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.5e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.5e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.5e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.4e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.5e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.5e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.5e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.5e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.5e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.4e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.0 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.8e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.8e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.8e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.1 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.8e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.8e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.7e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.10 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.6e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.6e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.6e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.10 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.2e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.2e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.2e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.2 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.1e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.1e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.1e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.3 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.4e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.4e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.4e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.3 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.4e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.4e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.4e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.4 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.4e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.4e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.7e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.7e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.7e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.7e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.7e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.6e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.6 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.7 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.9e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.7 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.3e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.8 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.3e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.8 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.3e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 2.2e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
sparse master linux-3.9 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n:
>>>>>>>>
make: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.3e+03 s in the future
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.3e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make[2]: Warning: File `/home/batman/build_test/tmp/Makefile.kbuild' has modification time 3.2e+03 s in the future
make[2]: warning: Clock skew detected. Your build may be incomplete.
make: warning: Clock skew detected. Your build may be incomplete.
The following commit has been merged in the master branch:
commit c3923b7a3dae842017d1206f43e23cd9ba1148b9
Author: Joe Perches <joe(a)perches.com>
Date: Sun Sep 1 15:45:08 2013 -0700
batman: Remove reference to compare_ether_addr
This function is being removed, rename the reference.
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Antonio Quartulli <ordex(a)autistici.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 5d00f23..2467552 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -254,7 +254,7 @@ static inline void batadv_dbg(int type __always_unused,
/* returns 1 if they are the same ethernet addr
*
- * note: can't use compare_ether_addr() as it requires aligned memory
+ * note: can't use ether_addr_equal() as it requires aligned memory
*/
static inline int batadv_compare_eth(const void *data1, const void *data2)
{
--
LinuxNextTracking