extract part of find_rcv_list() into new function find_dev_rcv_lists().

git-svn-id: svn://svn.berlios.de//socketcan/trunk@74 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index 68df45ce265c0d9c52062d185ee203343b5d8960..2a64b7173b03411c834ce5b79f3e74cfe1e6a0bb 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -734,25 +734,12 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb)
        return matches;
 }
 
-static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
-                                       struct net_device *dev)
+static struct dev_rcv_lists *find_dev_rcv_lists(struct net_device *dev,
+                                               int create)
 {
-       canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking values */
-       canid_t eff = *can_id & *mask & CAN_EFF_FLAG; /* correct EFF check? */
-       canid_t rtr = *can_id & *mask & CAN_RTR_FLAG; /* correct RTR check? */
-       canid_t err = *mask & CAN_ERR_FLAG; /* mask for error frames only */
-
        struct dev_rcv_lists *d;
        struct hlist_node *n;
 
-       /* make some paranoic operations */
-       if (*can_id & CAN_EFF_FLAG)
-               *mask &= (CAN_EFF_MASK | eff | rtr);
-       else
-               *mask &= (CAN_SFF_MASK | rtr);
-
-       *can_id &= *mask;
-
        /* find receive list for this device */
        if (!dev)
                d = &rx_alldev_list;
@@ -761,7 +748,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
                struct dev_rcv_lists *q;
                d = NULL;
                hlist_for_each_entry(q, n, &rx_dev_list, list)
-                       if (!q->dev)
+                       if (!q->dev && create)
                                d = q;
                        else if (q->dev == dev) {
                                d = q;
@@ -774,7 +761,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
                }
        }
 
-       if (!d) {
+       if (!d && create) {
                /* create new dev_rcv_lists for this device */
                DBG("creating new dev_rcv_lists for %s\n", dev->name);
                if (!(d = kmalloc(sizeof(struct dev_rcv_lists), GFP_KERNEL))) {
@@ -785,12 +772,35 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
                        for the embedded hlist_head structs.
                        Another list type, e.g. list_head, would require
                        explicit initialization. */
-               memset (d, 0, sizeof(struct dev_rcv_lists));
+               memset(d, 0, sizeof(struct dev_rcv_lists));
 
                d->dev = dev;
                hlist_add_head(&d->list, &rx_dev_list);
        }
 
+       return d;
+}
+
+static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
+                                       struct net_device *dev)
+{
+       canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking values */
+       canid_t eff = *can_id & *mask & CAN_EFF_FLAG; /* correct EFF check? */
+       canid_t rtr = *can_id & *mask & CAN_RTR_FLAG; /* correct RTR check? */
+       canid_t err = *mask & CAN_ERR_FLAG; /* mask for error frames only */
+
+       struct dev_rcv_lists *d;
+
+       /* make some paranoic operations */
+       if (*can_id & CAN_EFF_FLAG)
+               *mask &= (CAN_EFF_MASK | eff | rtr);
+       else
+               *mask &= (CAN_SFF_MASK | rtr);
+
+       *can_id &= *mask;
+
+       d = find_dev_rcv_lists(dev, 1);
+
        if (err) /* error frames */
                return &d->rx_err;