batman-adv: cumulative upgrade to release 2013.4.0
This commit is contained in:
Moritz Warning
parent
cee4be1393
commit
98b20ec4d6
|
|
@ -14,6 +14,11 @@ config KMOD_BATMAN_ADV_DAT
|
|||
depends on PACKAGE_kmod-batman-adv
|
||||
default y
|
||||
|
||||
config KMOD_BATMAN_ADV_NC
|
||||
bool "enable network coding [requires promisc mode support]"
|
||||
depends on PACKAGE_kmod-batman-adv
|
||||
default n
|
||||
|
||||
config KMOD_BATMAN_ADV_BATCTL
|
||||
bool "enable batctl"
|
||||
depends on PACKAGE_kmod-batman-adv
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=batman-adv
|
||||
|
||||
PKG_VERSION:=2013.1.0
|
||||
BATCTL_VERSION:=2013.1.0
|
||||
PKG_RELEASE:=3
|
||||
PKG_MD5SUM:=fe1fd32eddde1f91575d7a7ec21d5782
|
||||
BATCTL_MD5SUM:=767bf36c77c517e1d321169bf9a7fae5
|
||||
PKG_VERSION:=2013.4.0
|
||||
BATCTL_VERSION:=2013.4.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_MD5SUM:=6590caa324709289e3cb142273a5ff57
|
||||
BATCTL_MD5SUM:=42e269cc710bbc9a8fd17628201d4258
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
||||
|
|
@ -57,18 +57,32 @@ MAKE_BATMAN_ADV_ARGS += \
|
|||
CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \
|
||||
CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \
|
||||
CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \
|
||||
CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_NC),y,n) \
|
||||
REVISION="" all
|
||||
|
||||
MAKE_BATCTL_ARGS += \
|
||||
# The linker can identify unused sections of a binary when each symbol is stored
|
||||
# in a separate section. This mostly removes unused linker sections and reduces
|
||||
# the size by ~3% on mipsel.
|
||||
|
||||
TARGET_CFLAGS += -ffunction-sections -fdata-sections
|
||||
TARGET_LDFLAGS += -Wl,--gc-sections
|
||||
|
||||
# Link-time optimization allows to move parts of the optimization from the single
|
||||
# source file to the global source view. This is done by emitting the GIMPLE
|
||||
# representation in each object file and analyzing it again during the link step.
|
||||
|
||||
TARGET_CFLAGS += -flto
|
||||
TARGET_LDFLAGS += -fuse-linker-plugin
|
||||
|
||||
MAKE_BATCTL_ENV += \
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS)" \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
CCFLAGS="$(TARGET_CFLAGS)" \
|
||||
OFLAGS="$(TARGET_CFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)"
|
||||
|
||||
MAKE_BATCTL_ARGS += \
|
||||
REVISION="" \
|
||||
CC="$(TARGET_CC)" \
|
||||
NODEBUG=1 \
|
||||
UNAME="Linux" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
STRIP="/bin/true" \
|
||||
batctl install
|
||||
|
||||
ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
|
||||
|
|
@ -81,7 +95,7 @@ $(eval $(call Download,batctl))
|
|||
|
||||
BATCTL_EXTRACT = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)"
|
||||
BATCTL_PATCH = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*")
|
||||
BATCTL_BUILD = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
|
||||
BATCTL_BUILD = $(MAKE_BATCTL_ENV) $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
|
||||
BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/
|
||||
endif
|
||||
|
||||
|
|
@ -100,6 +114,13 @@ define Build/Patch
|
|||
$(BATCTL_PATCH)
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
$(call Build/Prepare/Default)
|
||||
$(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a\#undef CONFIG_MODULE_STRIPPED' \
|
||||
$(PKG_BUILD_DIR)/main.h
|
||||
endef
|
||||
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS)
|
||||
$(BATCTL_BUILD)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ config 'mesh' 'bat0'
|
|||
option 'vis_mode'
|
||||
option 'bridge_loop_avoidance'
|
||||
option 'distributed_arp_table'
|
||||
option 'network_coding'
|
||||
option 'hop_penalty'
|
||||
|
||||
# yet another batX instance
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@ bat_load_module()
|
|||
[ -d "/sys/module/batman_adv/" ] && return
|
||||
|
||||
. /lib/functions.sh
|
||||
load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-batman-adv*
|
||||
load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-crypto* /etc/modules.d/*-lib-crc* /etc/modules.d/*-batman-adv*
|
||||
}
|
||||
|
||||
bat_config()
|
||||
{
|
||||
local mesh="$1"
|
||||
local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation
|
||||
local gw_bandwidth gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode
|
||||
local gw_bandwidth gw_mode gw_sel_class hop_penalty network_coding log_level orig_interval vis_mode
|
||||
|
||||
config_get aggregated_ogms "$mesh" aggregated_ogms
|
||||
config_get ap_isolation "$mesh" ap_isolation
|
||||
|
|
@ -24,6 +24,7 @@ bat_config()
|
|||
config_get gw_mode "$mesh" gw_mode
|
||||
config_get gw_sel_class "$mesh" gw_sel_class
|
||||
config_get hop_penalty "$mesh" hop_penalty
|
||||
config_get network_coding "$mesh" network_coding
|
||||
config_get log_level "$mesh" log_level
|
||||
config_get orig_interval "$mesh" orig_interval
|
||||
config_get vis_mode "$mesh" vis_mode
|
||||
|
|
@ -33,13 +34,14 @@ bat_config()
|
|||
[ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms
|
||||
[ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation
|
||||
[ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding
|
||||
[ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance
|
||||
[ -n "$distributed_arp_table" ] && echo $distributed_arp_table > /sys/class/net/$mesh/mesh/distributed_arp_table
|
||||
[ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance 2>&-
|
||||
[ -n "$distributed_arp_table" ] && echo $distributed_arp_table > /sys/class/net/$mesh/mesh/distributed_arp_table 2>&-
|
||||
[ -n "$fragmentation" ] && echo $fragmentation > /sys/class/net/$mesh/mesh/fragmentation
|
||||
[ -n "$gw_bandwidth" ] && echo $gw_bandwidth > /sys/class/net/$mesh/mesh/gw_bandwidth
|
||||
[ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode
|
||||
[ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class
|
||||
[ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty
|
||||
[ -n "$network_coding" ] && echo $network_coding > /sys/class/net/$mesh/mesh/network_coding 2>&-
|
||||
[ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&-
|
||||
[ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval
|
||||
[ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
From 2c7bfe1299efa97438814bf6826a8f7ab3bc0b16 Mon Sep 17 00:00:00 2001
|
||||
From: Sven Eckelmann <sven@narfation.org>
|
||||
Date: Tue, 7 May 2013 14:51:02 +0200
|
||||
Subject: [PATCH] batctl: Add CFLAGS to the linker step
|
||||
|
||||
The GCC manual states for different parameters that the options for compilation
|
||||
must also be used when linking. The options for compilation are stored in
|
||||
CFLAGS and added to LINK.o to fix the behavior.
|
||||
|
||||
Option which need this are for example -fPIC/-fPIE or -flto.
|
||||
|
||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
||||
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 311e70e..233f453 100755
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -53,7 +53,7 @@ RM ?= rm -f
|
||||
INSTALL ?= install
|
||||
MKDIR ?= mkdir -p
|
||||
COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
|
||||
-LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH)
|
||||
+LINK.o = $(Q_LD)$(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH)
|
||||
|
||||
# standard install paths
|
||||
PREFIX = /usr/local
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From e56c79f4e863436d0fc6c48fed0db09b7a49e565 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Lindner <lindner_marek@yahoo.de>
|
||||
Date: Mon, 4 Mar 2013 10:39:49 +0800
|
||||
Subject: [PATCH 1/3] batman-adv: verify tt len does not exceed packet len
|
||||
|
||||
batadv_iv_ogm_process() accesses the packet using the tt_num_changes
|
||||
attribute regardless of the real packet len (assuming the length check
|
||||
was done before). Therefore a length check is needed to avoid reading
|
||||
random memory.
|
||||
|
||||
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
|
||||
---
|
||||
bat_iv_ogm.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
|
||||
index 72fe1bb..d5be889 100644
|
||||
--- a/bat_iv_ogm.c
|
||||
+++ b/bat_iv_ogm.c
|
||||
@@ -1292,7 +1292,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb,
|
||||
batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;
|
||||
|
||||
/* unpack the aggregated packets and process them one by one */
|
||||
- do {
|
||||
+ while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len,
|
||||
+ batadv_ogm_packet->tt_num_changes)) {
|
||||
tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN;
|
||||
|
||||
batadv_iv_ogm_process(ethhdr, batadv_ogm_packet, tt_buff,
|
||||
@@ -1303,8 +1304,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb,
|
||||
|
||||
packet_pos = packet_buff + buff_pos;
|
||||
batadv_ogm_packet = (struct batadv_ogm_packet *)packet_pos;
|
||||
- } while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len,
|
||||
- batadv_ogm_packet->tt_num_changes));
|
||||
+ }
|
||||
|
||||
kfree_skb(skb);
|
||||
return NET_RX_SUCCESS;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,250 +0,0 @@
|
|||
From 647d23f3e358d9fa4b1a8f0bb67a3e6bff30d4a1 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Quartulli <ordex@autistici.org>
|
||||
Date: Wed, 3 Apr 2013 19:10:26 +0200
|
||||
Subject: [PATCH 3/3] batman-adv: make is_my_mac() check for the current mesh
|
||||
only
|
||||
|
||||
On a multi-mesh node (a node running more than one batman-adv
|
||||
virtual interface) batadv_is_my_mac() has to check MAC
|
||||
addresses of hard interfaces belonging to the current mesh
|
||||
only.
|
||||
|
||||
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
|
||||
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
|
||||
---
|
||||
main.c | 5 ++++-
|
||||
main.h | 2 +-
|
||||
routing.c | 38 ++++++++++++++++++++------------------
|
||||
translation-table.c | 2 +-
|
||||
vis.c | 4 ++--
|
||||
5 files changed, 28 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/main.c b/main.c
|
||||
index 0488d70..fa563e4 100644
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -169,7 +169,7 @@ void batadv_mesh_free(struct net_device *soft_iface)
|
||||
atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
|
||||
}
|
||||
|
||||
-int batadv_is_my_mac(const uint8_t *addr)
|
||||
+int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr)
|
||||
{
|
||||
const struct batadv_hard_iface *hard_iface;
|
||||
|
||||
@@ -178,6 +178,9 @@ int batadv_is_my_mac(const uint8_t *addr)
|
||||
if (hard_iface->if_status != BATADV_IF_ACTIVE)
|
||||
continue;
|
||||
|
||||
+ if (hard_iface->soft_iface != bat_priv->soft_iface)
|
||||
+ continue;
|
||||
+
|
||||
if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) {
|
||||
rcu_read_unlock();
|
||||
return 1;
|
||||
diff --git a/main.h b/main.h
|
||||
index 08c5dd1..fcb5d65 100644
|
||||
--- a/main.h
|
||||
+++ b/main.h
|
||||
@@ -164,7 +164,7 @@ extern struct workqueue_struct *batadv_event_workqueue;
|
||||
|
||||
int batadv_mesh_init(struct net_device *soft_iface);
|
||||
void batadv_mesh_free(struct net_device *soft_iface);
|
||||
-int batadv_is_my_mac(const uint8_t *addr);
|
||||
+int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr);
|
||||
struct batadv_hard_iface *
|
||||
batadv_seq_print_text_primary_if_get(struct seq_file *seq);
|
||||
int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
|
||||
diff --git a/routing.c b/routing.c
|
||||
index 5ee21ce..319f290 100644
|
||||
--- a/routing.c
|
||||
+++ b/routing.c
|
||||
@@ -402,7 +402,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
|
||||
goto out;
|
||||
|
||||
/* not for me */
|
||||
- if (!batadv_is_my_mac(ethhdr->h_dest))
|
||||
+ if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
|
||||
goto out;
|
||||
|
||||
icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
|
||||
@@ -416,7 +416,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
|
||||
}
|
||||
|
||||
/* packet for me */
|
||||
- if (batadv_is_my_mac(icmp_packet->dst))
|
||||
+ if (batadv_is_my_mac(bat_priv, icmp_packet->dst))
|
||||
return batadv_recv_my_icmp_packet(bat_priv, skb, hdr_size);
|
||||
|
||||
/* TTL exceeded */
|
||||
@@ -548,7 +548,8 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig,
|
||||
return router;
|
||||
}
|
||||
|
||||
-static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size)
|
||||
+static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
|
||||
+ struct sk_buff *skb, int hdr_size)
|
||||
{
|
||||
struct ethhdr *ethhdr;
|
||||
|
||||
@@ -567,7 +568,7 @@ static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size)
|
||||
return -1;
|
||||
|
||||
/* not for me */
|
||||
- if (!batadv_is_my_mac(ethhdr->h_dest))
|
||||
+ if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
@@ -582,7 +583,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
|
||||
char tt_flag;
|
||||
size_t packet_size;
|
||||
|
||||
- if (batadv_check_unicast_packet(skb, hdr_size) < 0)
|
||||
+ if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
|
||||
return NET_RX_DROP;
|
||||
|
||||
/* I could need to modify it */
|
||||
@@ -614,7 +615,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
|
||||
case BATADV_TT_RESPONSE:
|
||||
batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_RX);
|
||||
|
||||
- if (batadv_is_my_mac(tt_query->dst)) {
|
||||
+ if (batadv_is_my_mac(bat_priv, tt_query->dst)) {
|
||||
/* packet needs to be linearized to access the TT
|
||||
* changes
|
||||
*/
|
||||
@@ -657,14 +658,15 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
|
||||
struct batadv_roam_adv_packet *roam_adv_packet;
|
||||
struct batadv_orig_node *orig_node;
|
||||
|
||||
- if (batadv_check_unicast_packet(skb, sizeof(*roam_adv_packet)) < 0)
|
||||
+ if (batadv_check_unicast_packet(bat_priv, skb,
|
||||
+ sizeof(*roam_adv_packet)) < 0)
|
||||
goto out;
|
||||
|
||||
batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX);
|
||||
|
||||
roam_adv_packet = (struct batadv_roam_adv_packet *)skb->data;
|
||||
|
||||
- if (!batadv_is_my_mac(roam_adv_packet->dst))
|
||||
+ if (!batadv_is_my_mac(bat_priv, roam_adv_packet->dst))
|
||||
return batadv_route_unicast_packet(skb, recv_if);
|
||||
|
||||
/* check if it is a backbone gateway. we don't accept
|
||||
@@ -967,7 +969,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
|
||||
* last time) the packet had an updated information or not
|
||||
*/
|
||||
curr_ttvn = (uint8_t)atomic_read(&bat_priv->tt.vn);
|
||||
- if (!batadv_is_my_mac(unicast_packet->dest)) {
|
||||
+ if (!batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
|
||||
orig_node = batadv_orig_hash_find(bat_priv,
|
||||
unicast_packet->dest);
|
||||
/* if it is not possible to find the orig_node representing the
|
||||
@@ -1044,14 +1046,14 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
|
||||
if (is4addr)
|
||||
hdr_size = sizeof(*unicast_4addr_packet);
|
||||
|
||||
- if (batadv_check_unicast_packet(skb, hdr_size) < 0)
|
||||
+ if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
|
||||
return NET_RX_DROP;
|
||||
|
||||
if (!batadv_check_unicast_ttvn(bat_priv, skb))
|
||||
return NET_RX_DROP;
|
||||
|
||||
/* packet for me */
|
||||
- if (batadv_is_my_mac(unicast_packet->dest)) {
|
||||
+ if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
|
||||
if (is4addr) {
|
||||
batadv_dat_inc_counter(bat_priv,
|
||||
unicast_4addr_packet->subtype);
|
||||
@@ -1088,7 +1090,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
|
||||
struct sk_buff *new_skb = NULL;
|
||||
int ret;
|
||||
|
||||
- if (batadv_check_unicast_packet(skb, hdr_size) < 0)
|
||||
+ if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
|
||||
return NET_RX_DROP;
|
||||
|
||||
if (!batadv_check_unicast_ttvn(bat_priv, skb))
|
||||
@@ -1097,7 +1099,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
|
||||
unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;
|
||||
|
||||
/* packet for me */
|
||||
- if (batadv_is_my_mac(unicast_packet->dest)) {
|
||||
+ if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
|
||||
ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);
|
||||
|
||||
if (ret == NET_RX_DROP)
|
||||
@@ -1151,13 +1153,13 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
|
||||
goto out;
|
||||
|
||||
/* ignore broadcasts sent by myself */
|
||||
- if (batadv_is_my_mac(ethhdr->h_source))
|
||||
+ if (batadv_is_my_mac(bat_priv, ethhdr->h_source))
|
||||
goto out;
|
||||
|
||||
bcast_packet = (struct batadv_bcast_packet *)skb->data;
|
||||
|
||||
/* ignore broadcasts originated by myself */
|
||||
- if (batadv_is_my_mac(bcast_packet->orig))
|
||||
+ if (batadv_is_my_mac(bat_priv, bcast_packet->orig))
|
||||
goto out;
|
||||
|
||||
if (bcast_packet->header.ttl < 2)
|
||||
@@ -1243,14 +1245,14 @@ int batadv_recv_vis_packet(struct sk_buff *skb,
|
||||
ethhdr = (struct ethhdr *)skb_mac_header(skb);
|
||||
|
||||
/* not for me */
|
||||
- if (!batadv_is_my_mac(ethhdr->h_dest))
|
||||
+ if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
|
||||
return NET_RX_DROP;
|
||||
|
||||
/* ignore own packets */
|
||||
- if (batadv_is_my_mac(vis_packet->vis_orig))
|
||||
+ if (batadv_is_my_mac(bat_priv, vis_packet->vis_orig))
|
||||
return NET_RX_DROP;
|
||||
|
||||
- if (batadv_is_my_mac(vis_packet->sender_orig))
|
||||
+ if (batadv_is_my_mac(bat_priv, vis_packet->sender_orig))
|
||||
return NET_RX_DROP;
|
||||
|
||||
switch (vis_packet->vis_type) {
|
||||
diff --git a/translation-table.c b/translation-table.c
|
||||
index 98a66a0..7abee19 100644
|
||||
--- a/translation-table.c
|
||||
+++ b/translation-table.c
|
||||
@@ -1953,7 +1953,7 @@ out:
|
||||
bool batadv_send_tt_response(struct batadv_priv *bat_priv,
|
||||
struct batadv_tt_query_packet *tt_request)
|
||||
{
|
||||
- if (batadv_is_my_mac(tt_request->dst)) {
|
||||
+ if (batadv_is_my_mac(bat_priv, tt_request->dst)) {
|
||||
/* don't answer backbone gws! */
|
||||
if (batadv_bla_is_backbone_gw_orig(bat_priv, tt_request->src))
|
||||
return true;
|
||||
diff --git a/vis.c b/vis.c
|
||||
index c053244..6a1e646 100644
|
||||
--- a/vis.c
|
||||
+++ b/vis.c
|
||||
@@ -477,7 +477,7 @@ void batadv_receive_client_update_packet(struct batadv_priv *bat_priv,
|
||||
|
||||
/* Are we the target for this VIS packet? */
|
||||
if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC &&
|
||||
- batadv_is_my_mac(vis_packet->target_orig))
|
||||
+ batadv_is_my_mac(bat_priv, vis_packet->target_orig))
|
||||
are_target = 1;
|
||||
|
||||
spin_lock_bh(&bat_priv->vis.hash_lock);
|
||||
@@ -496,7 +496,7 @@ void batadv_receive_client_update_packet(struct batadv_priv *bat_priv,
|
||||
batadv_send_list_add(bat_priv, info);
|
||||
|
||||
/* ... we're not the recipient (and thus need to forward). */
|
||||
- } else if (!batadv_is_my_mac(packet->target_orig)) {
|
||||
+ } else if (!batadv_is_my_mac(bat_priv, packet->target_orig)) {
|
||||
batadv_send_list_add(bat_priv, info);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
Loading…
Reference in New Issue