aboutsummaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorSjur Braendeland <sjur.brandeland@stericsson.com>2010-09-21 07:44:45 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-21 21:05:31 -0400
commite5e03ce1e5c6c015cabf274b24976dff408dc07f (patch)
tree678a2979a820f2ec3e99b26561a8eff2d35c0267 /net/caif
parentb04367df66eb63444d38c43d15f5e39499d85ae6 (diff)
caif: Fix function NULL pointer check.
Check that receive function pointer is not null before calling it. Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
-rw-r--r--net/caif/caif_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 0fd01dd17c48..b99369a055d1 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -173,7 +173,7 @@ static int receive(struct sk_buff *skb, struct net_device *dev,
173 net = dev_net(dev); 173 net = dev_net(dev);
174 pkt = cfpkt_fromnative(CAIF_DIR_IN, skb); 174 pkt = cfpkt_fromnative(CAIF_DIR_IN, skb);
175 caifd = caif_get(dev); 175 caifd = caif_get(dev);
176 if (!caifd || !caifd->layer.up || !caifd->layer.up->ctrlcmd) 176 if (!caifd || !caifd->layer.up || !caifd->layer.up->receive)
177 return NET_RX_DROP; 177 return NET_RX_DROP;
178 178
179 if (caifd->layer.up->receive(caifd->layer.up, pkt)) 179 if (caifd->layer.up->receive(caifd->layer.up, pkt))