|
@@ -369,12 +369,11 @@ out:
|
|
|
* batadv_dbg_arp - print a debug message containing all the ARP packet details
|
|
|
* @bat_priv: the bat priv with all the soft interface information
|
|
|
* @skb: ARP packet
|
|
|
- * @type: ARP type
|
|
|
* @hdr_size: size of the possible header before the ARP packet
|
|
|
* @msg: message to print together with the debugging information
|
|
|
*/
|
|
|
static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
|
- u16 type, int hdr_size, char *msg)
|
|
|
+ int hdr_size, char *msg)
|
|
|
{
|
|
|
struct batadv_unicast_4addr_packet *unicast_4addr_packet;
|
|
|
struct batadv_bcast_packet *bcast_pkt;
|
|
@@ -441,7 +440,7 @@ static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
|
#else
|
|
|
|
|
|
static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
|
- u16 type, int hdr_size, char *msg)
|
|
|
+ int hdr_size, char *msg)
|
|
|
{
|
|
|
}
|
|
|
|
|
@@ -983,8 +982,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
|
|
|
if (type != ARPOP_REQUEST)
|
|
|
goto out;
|
|
|
|
|
|
- batadv_dbg_arp(bat_priv, skb, type, hdr_size,
|
|
|
- "Parsing outgoing ARP REQUEST");
|
|
|
+ batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing outgoing ARP REQUEST");
|
|
|
|
|
|
ip_src = batadv_arp_ip_src(skb, hdr_size);
|
|
|
hw_src = batadv_arp_hw_src(skb, hdr_size);
|
|
@@ -1075,8 +1073,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
|
|
|
ip_src = batadv_arp_ip_src(skb, hdr_size);
|
|
|
ip_dst = batadv_arp_ip_dst(skb, hdr_size);
|
|
|
|
|
|
- batadv_dbg_arp(bat_priv, skb, type, hdr_size,
|
|
|
- "Parsing incoming ARP REQUEST");
|
|
|
+ batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing incoming ARP REQUEST");
|
|
|
|
|
|
batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid);
|
|
|
|
|
@@ -1149,8 +1146,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,
|
|
|
if (type != ARPOP_REPLY)
|
|
|
return;
|
|
|
|
|
|
- batadv_dbg_arp(bat_priv, skb, type, hdr_size,
|
|
|
- "Parsing outgoing ARP REPLY");
|
|
|
+ batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing outgoing ARP REPLY");
|
|
|
|
|
|
hw_src = batadv_arp_hw_src(skb, hdr_size);
|
|
|
ip_src = batadv_arp_ip_src(skb, hdr_size);
|
|
@@ -1195,8 +1191,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
|
|
|
if (type != ARPOP_REPLY)
|
|
|
goto out;
|
|
|
|
|
|
- batadv_dbg_arp(bat_priv, skb, type, hdr_size,
|
|
|
- "Parsing incoming ARP REPLY");
|
|
|
+ batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing incoming ARP REPLY");
|
|
|
|
|
|
hw_src = batadv_arp_hw_src(skb, hdr_size);
|
|
|
ip_src = batadv_arp_ip_src(skb, hdr_size);
|