diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-16 16:28:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-16 16:28:53 -0400 |
| commit | 2f67cc87d662e935d2cfaea5a3fb7138ac35c5de (patch) | |
| tree | 9566da4e23526af552b065c2f12c058e52969e79 /net/batman-adv/distributed-arp-table.c | |
| parent | 0d08fceb2e21c30ca3e1e462e678723f806acf18 (diff) | |
| parent | cc2f33860cea0e48ebec096130bd0f7c4bf6e0bc (diff) | |
| download | op-kernel-dev-2f67cc87d662e935d2cfaea5a3fb7138ac35c5de.zip op-kernel-dev-2f67cc87d662e935d2cfaea5a3fb7138ac35c5de.tar.gz | |
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
Include changes:
- fix NULL dereference in batadv_orig_hardif_seq_print_text()
- fix reference counting imbalance when using fragmentation
- avoid access to orig_node objects after they have been free'd
- fix local TT check for outgoing arp requests in DAT
Diffstat (limited to 'net/batman-adv/distributed-arp-table.c')
| -rw-r--r-- | net/batman-adv/distributed-arp-table.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index b25fd64..aa5d494 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -940,8 +940,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, * additional DAT answer may trigger kernel warnings about * a packet coming from the wrong port. */ - if (batadv_is_my_client(bat_priv, dat_entry->mac_addr, - BATADV_NO_FLAGS)) { + if (batadv_is_my_client(bat_priv, dat_entry->mac_addr, vid)) { ret = true; goto out; } |
