From 9bf18d64498854e1bf9586d5ba447aa50b034436 Mon Sep 17 00:00:00 2001 From: Sjur Braendeland Date: Tue, 21 Sep 2010 11:44:45 +0000 Subject: [PATCH] --- yaml --- r: 214607 b: refs/heads/master c: e5e03ce1e5c6c015cabf274b24976dff408dc07f h: refs/heads/master i: 214605: 376734265a12807b9d17c7696a25b74965b510c6 214603: d8357e88dd99d4101dc92ac024c3137c3e8cce9d 214599: f05f1a37cb1df5fab3419bd5c3421c9c6f03310a 214591: 062c0460869e5f70973439febc15ba7d0554bfc4 v: v3 --- [refs] | 2 +- trunk/net/caif/caif_dev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4526f893788f..229c6ece2eab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b04367df66eb63444d38c43d15f5e39499d85ae6 +refs/heads/master: e5e03ce1e5c6c015cabf274b24976dff408dc07f diff --git a/trunk/net/caif/caif_dev.c b/trunk/net/caif/caif_dev.c index 0fd01dd17c48..b99369a055d1 100644 --- a/trunk/net/caif/caif_dev.c +++ b/trunk/net/caif/caif_dev.c @@ -173,7 +173,7 @@ static int receive(struct sk_buff *skb, struct net_device *dev, net = dev_net(dev); pkt = cfpkt_fromnative(CAIF_DIR_IN, skb); caifd = caif_get(dev); - if (!caifd || !caifd->layer.up || !caifd->layer.up->ctrlcmd) + if (!caifd || !caifd->layer.up || !caifd->layer.up->receive) return NET_RX_DROP; if (caifd->layer.up->receive(caifd->layer.up, pkt))