p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

batman-adv: Remove unused parameter recv_if of batadv_interface_rx 

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
This commit is contained in:
Sven Eckelmann 2016-02-28 11:38:51 +01:00 committed by Antonio Quartulli
parent c047c3b1af
commit 6535db56d5
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -912,7 +912,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
hdr_size)) hdr_size))
goto rx_success; goto rx_success;
batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, batadv_interface_rx(recv_if->soft_iface, skb, hdr_size,
orig_node); orig_node);
rx_success: rx_success:
@ -1122,8 +1122,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
goto rx_success; goto rx_success;
/* broadcast for me */ /* broadcast for me */
batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, batadv_interface_rx(recv_if->soft_iface, skb, hdr_size, orig_node);
orig_node);
rx_success: rx_success:
ret = NET_RX_SUCCESS; ret = NET_RX_SUCCESS;

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

@ -385,7 +385,6 @@ static int batadv_interface_tx(struct sk_buff *skb,
* batadv_interface_rx - receive ethernet frame on local batman-adv interface * batadv_interface_rx - receive ethernet frame on local batman-adv interface
* @soft_iface: local interface which will receive the ethernet frame * @soft_iface: local interface which will receive the ethernet frame
* @skb: ethernet frame for @soft_iface * @skb: ethernet frame for @soft_iface
* @recv_if: interface on which the batman-adv packet was received
* @hdr_size: size of already parsed batman-adv header * @hdr_size: size of already parsed batman-adv header
* @orig_node: originator from which the batman-adv packet was sent * @orig_node: originator from which the batman-adv packet was sent
* *
@ -400,8 +399,8 @@ static int batadv_interface_tx(struct sk_buff *skb,
* isolated clients. * isolated clients.
*/ */
void batadv_interface_rx(struct net_device *soft_iface, void batadv_interface_rx(struct net_device *soft_iface,
struct sk_buff *skb, struct batadv_hard_iface *recv_if, struct sk_buff *skb, int hdr_size,
int hdr_size, struct batadv_orig_node *orig_node) struct batadv_orig_node *orig_node)
{ {
struct batadv_bcast_packet *batadv_bcast_packet; struct batadv_bcast_packet *batadv_bcast_packet;
struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_priv *bat_priv = netdev_priv(soft_iface);

4
net/batman-adv/soft-interface.h
View File

@ -27,8 +27,8 @@ struct sk_buff;
int batadv_skb_head_push(struct sk_buff *skb, unsigned int len); int batadv_skb_head_push(struct sk_buff *skb, unsigned int len);
void batadv_interface_rx(struct net_device *soft_iface, void batadv_interface_rx(struct net_device *soft_iface,
struct sk_buff *skb, struct batadv_hard_iface *recv_if, struct sk_buff *skb, int hdr_size,
int hdr_size, struct batadv_orig_node *orig_node); struct batadv_orig_node *orig_node);
struct net_device *batadv_softif_create(const char *name); struct net_device *batadv_softif_create(const char *name);
void batadv_softif_destroy_sysfs(struct net_device *soft_iface); void batadv_softif_destroy_sysfs(struct net_device *soft_iface);
int batadv_softif_is_valid(const struct net_device *net_dev); int batadv_softif_is_valid(const struct net_device *net_dev);