From e8c017054649953ebaff19da68b1734cb6602d33 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 19 Oct 2010 11:59:10 +0200 Subject: [PATCH] --- yaml --- r: 220378 b: refs/heads/master c: 9b37bc2c711b2a76ef3daa9437bbf9c58411afbd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/send.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2bc106236efc..6a7a9539cbc8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ee600ced32c4cabaeead0a4e84a6d4c9110f82c +refs/heads/master: 9b37bc2c711b2a76ef3daa9437bbf9c58411afbd diff --git a/trunk/drivers/staging/batman-adv/send.c b/trunk/drivers/staging/batman-adv/send.c index 5d57ef5120b0..903286159b6e 100644 --- a/trunk/drivers/staging/batman-adv/send.c +++ b/trunk/drivers/staging/batman-adv/send.c @@ -160,8 +160,8 @@ static void send_packet_to_if(struct forw_packet *forw_packet, static void send_packet(struct forw_packet *forw_packet) { struct batman_if *batman_if; - struct net_device *soft_iface = forw_packet->if_incoming->soft_iface; - struct bat_priv *bat_priv = netdev_priv(soft_iface); + struct net_device *soft_iface; + struct bat_priv *bat_priv; struct batman_packet *batman_packet = (struct batman_packet *)(forw_packet->skb->data); unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0); @@ -172,6 +172,9 @@ static void send_packet(struct forw_packet *forw_packet) return; } + soft_iface = forw_packet->if_incoming->soft_iface; + bat_priv = netdev_priv(soft_iface); + if (forw_packet->if_incoming->if_status != IF_ACTIVE) return;