aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/distributed-arp-table.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/distributed-arp-table.c')
-rw-r--r--net/batman-adv/distributed-arp-table.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index b316a4cb6f14..997ae6ac51ff 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -12,9 +12,7 @@
12 * General Public License for more details. 12 * General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program; if not, write to the Free Software 15 * along with this program; if not, see <http://www.gnu.org/licenses/>.
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 * 02110-1301, USA
18 */ 16 */
19 17
20#include <linux/if_ether.h> 18#include <linux/if_ether.h>
@@ -141,7 +139,7 @@ static int batadv_compare_dat(const struct hlist_node *node, const void *data2)
141 const void *data1 = container_of(node, struct batadv_dat_entry, 139 const void *data1 = container_of(node, struct batadv_dat_entry,
142 hash_entry); 140 hash_entry);
143 141
144 return (memcmp(data1, data2, sizeof(__be32)) == 0 ? 1 : 0); 142 return memcmp(data1, data2, sizeof(__be32)) == 0 ? 1 : 0;
145} 143}
146 144
147/** 145/**
@@ -1039,9 +1037,9 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
1039 if (hdr_size == sizeof(struct batadv_unicast_4addr_packet)) 1037 if (hdr_size == sizeof(struct batadv_unicast_4addr_packet))
1040 err = batadv_send_skb_via_tt_4addr(bat_priv, skb_new, 1038 err = batadv_send_skb_via_tt_4addr(bat_priv, skb_new,
1041 BATADV_P_DAT_CACHE_REPLY, 1039 BATADV_P_DAT_CACHE_REPLY,
1042 vid); 1040 NULL, vid);
1043 else 1041 else
1044 err = batadv_send_skb_via_tt(bat_priv, skb_new, vid); 1042 err = batadv_send_skb_via_tt(bat_priv, skb_new, NULL, vid);
1045 1043
1046 if (err != NET_XMIT_DROP) { 1044 if (err != NET_XMIT_DROP) {
1047 batadv_inc_counter(bat_priv, BATADV_CNT_DAT_CACHED_REPLY_TX); 1045 batadv_inc_counter(bat_priv, BATADV_CNT_DAT_CACHED_REPLY_TX);