diff options
| author | Sven Eckelmann <sven@narfation.org> | 2016-02-28 11:38:51 +0100 |
|---|---|---|
| committer | Antonio Quartulli <a@unstable.cc> | 2016-05-10 12:26:43 +0200 |
| commit | 6535db56d5453555b7a40230024225d9ec700585 (patch) | |
| tree | b448b84b85177e7e3d8a2f2c91ac4890e1e50c02 | |
| parent | netfilter: conntrack: remove uninitialized shadow variable (diff) | |
| download | linux-6535db56d5453555b7a40230024225d9ec700585.tar.xz linux-6535db56d5453555b7a40230024225d9ec700585.zip | |
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>
| -rw-r--r-- | net/batman-adv/routing.c | 5 | ||||
| -rw-r--r-- | net/batman-adv/soft-interface.c | 5 | ||||
| -rw-r--r-- | net/batman-adv/soft-interface.h | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index b781bf753250..2ecfca246be4 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -912,7 +912,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, hdr_size)) 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); rx_success: @@ -1122,8 +1122,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, goto rx_success; /* broadcast for me */ - batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size, - orig_node); + batadv_interface_rx(recv_if->soft_iface, skb, hdr_size, orig_node); rx_success: ret = NET_RX_SUCCESS; diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index dfb4d56120b6..dc9a61a5122d 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -385,7 +385,6 @@ end: * batadv_interface_rx - receive ethernet frame on local batman-adv interface * @soft_iface: local interface which will receive the ethernet frame * @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 * @orig_node: originator from which the batman-adv packet was sent * @@ -400,8 +399,8 @@ end: * isolated clients. */ void batadv_interface_rx(struct net_device *soft_iface, - struct sk_buff *skb, struct batadv_hard_iface *recv_if, - int hdr_size, struct batadv_orig_node *orig_node) + struct sk_buff *skb, int hdr_size, + struct batadv_orig_node *orig_node) { struct batadv_bcast_packet *batadv_bcast_packet; struct batadv_priv *bat_priv = netdev_priv(soft_iface); diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 9ae265703d23..5942da3d03d5 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -27,8 +27,8 @@ struct sk_buff; int batadv_skb_head_push(struct sk_buff *skb, unsigned int len); void batadv_interface_rx(struct net_device *soft_iface, - struct sk_buff *skb, struct batadv_hard_iface *recv_if, - int hdr_size, struct batadv_orig_node *orig_node); + struct sk_buff *skb, int hdr_size, + struct batadv_orig_node *orig_node); struct net_device *batadv_softif_create(const char *name); void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); |