hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Linus Lüssing 2011-03-02 17:39:31 +00:00 committed by Marek Lindner
parent e6c10f433a
commit 7cefb149a6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/batman-adv/routing.c
View File

@ -1263,8 +1263,7 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size)
return 0; return 0;
} }
int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if, int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
int hdr_size)
{ {
struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
struct orig_node *orig_node = NULL; 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 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) 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 NET_RX_SUCCESS;
} }
return route_unicast_packet(skb, recv_if, hdr_size); return route_unicast_packet(skb, recv_if);
} }

3
net/batman-adv/routing.h
View File

@ -30,8 +30,7 @@ void receive_bat_packet(struct ethhdr *ethhdr,
void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node,
struct neigh_node *neigh_node, unsigned char *hna_buff, struct neigh_node *neigh_node, unsigned char *hna_buff,
int hna_buff_len); int hna_buff_len);
int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if, int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if);
int hdr_size);
int recv_icmp_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_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); int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if);

2
net/batman-adv/soft-interface.c
View File

@ -462,7 +462,7 @@ void interface_rx(struct net_device *soft_iface,
memcpy(unicast_packet->dest, memcpy(unicast_packet->dest,
bat_priv->softif_neigh->addr, ETH_ALEN); 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) if (ret == NET_RX_DROP)
goto dropped; goto dropped;