batman-adv: Remove unused hdr_size variable in route_unicast_packet()

Signed-off-by: Linus Lüssing <linus.luessing@ascom.ch>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 42cb6e2e44f51247313ddcf7eecd34a99c797299..c172f5d0e05a20d54d2fb68c346833eb14645825 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -1263,8 +1263,7 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size)
        return 0;
 }
 
-int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if,
-                        int hdr_size)
+int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
 {
        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
        struct orig_node *orig_node = NULL;
@@ -1365,7 +1364,7 @@ int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
                return NET_RX_SUCCESS;
        }
 
-       return route_unicast_packet(skb, recv_if, hdr_size);
+       return route_unicast_packet(skb, recv_if);
 }
 
 int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if)
@@ -1398,7 +1397,7 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if)
                return NET_RX_SUCCESS;
        }
 
-       return route_unicast_packet(skb, recv_if, hdr_size);
+       return route_unicast_packet(skb, recv_if);
 }
 
 

diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h
index 5efceaf4b978e67bd8633a9731695808f3cffb2a..b5a064c88a4f132025faa45c0b5ef17ad32b001a 100644 (file)
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@ -30,8 +30,7 @@ void receive_bat_packet(struct ethhdr *ethhdr,
 void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node,
                   struct neigh_node *neigh_node, unsigned char *hna_buff,
                   int hna_buff_len);
-int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if,
-                        int hdr_size);
+int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if);
 int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if);
 int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if);
 int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if);

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 95d1c3f86a66cebdd62c0abbb5307fcd6a74264a..6b514ecee5a2b8ce4a322d6a1ad9fb62887a3262 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -462,7 +462,7 @@ void interface_rx(struct net_device *soft_iface,
 
                memcpy(unicast_packet->dest,
                       bat_priv->softif_neigh->addr, ETH_ALEN);
-               ret = route_unicast_packet(skb, recv_if, hdr_size);
+               ret = route_unicast_packet(skb, recv_if);
                if (ret == NET_RX_DROP)
                        goto dropped;