diff options
| author | Marek Lindner <lindner_marek@yahoo.de> | 2010-05-07 21:47:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 13:42:39 -0700 |
| commit | 35bd69d42e2fba4c0fd547e3bf99a0afd5700f76 (patch) | |
| tree | 8c0b66705f0c1b9bdf0ab9f3e2a3b39c5b718699 /drivers/staging/batman-adv/soft-interface.c | |
| parent | 1d59f82cb876ee9a1b4adc4f9b1063b855eac015 (diff) | |
Staging: batman-adv: remove redundant pointer to originator interface
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/soft-interface.c')
| -rw-r--r-- | drivers/staging/batman-adv/soft-interface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c index 829deb694b84..4cdebe5f874f 100644 --- a/drivers/staging/batman-adv/soft-interface.c +++ b/drivers/staging/batman-adv/soft-interface.c @@ -236,7 +236,6 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev) orig_node = transtable_search(ethhdr->h_dest); if ((orig_node) && - (orig_node->batman_if) && (orig_node->router)) { if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0) goto unlock; @@ -252,13 +251,13 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev) memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); /* net_dev won't be available when not active */ - if (orig_node->batman_if->if_active != IF_ACTIVE) + if (orig_node->router->if_incoming->if_active != IF_ACTIVE) goto unlock; /* don't lock while sending the packets ... we therefore * copy the required data before sending */ - batman_if = orig_node->batman_if; + batman_if = orig_node->router->if_incoming; memcpy(dstaddr, orig_node->router->addr, ETH_ALEN); spin_unlock_irqrestore(&orig_hash_lock, flags); |