From bc5afd7898ae1e25b0e48fa9a7befb278889b61f Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <oliver@hartkopp.net>
Date: Thu, 4 Dec 2008 15:01:08 -0800
Subject: [PATCH] --- yaml --- r: 119759 b: refs/heads/master c:
 f706644d55f90e8306d87060168fef33804d6dd9 h: refs/heads/master i:   119757:
 fdcc4889dd6b0bb80ea659eb44a44a4ff26c58d1   119755:
 0643e8fc568ea8a8865bb218f8099651645451f6   119751:
 a16a9187618d7132475dc6e69b8069056979ab75   119743:
 a13ffbe0369010a4795b3d30fd102b60753a8942 v: v3

---
 [refs]                 | 2 +-
 trunk/net/can/af_can.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 72da85fb91f0..a2806f2c77e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b24b3c97498935a2ef9777370b1151dfed3f6f
+refs/heads/master: f706644d55f90e8306d87060168fef33804d6dd9
diff --git a/trunk/net/can/af_can.c b/trunk/net/can/af_can.c
index d8173e50cb87..3dadb338addd 100644
--- a/trunk/net/can/af_can.c
+++ b/trunk/net/can/af_can.c
@@ -622,7 +622,10 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb)
 		}
 	}
 
-	/* check CAN_ID specific entries */
+	/* check filterlists for single non-RTR can_ids */
+	if (can_id & CAN_RTR_FLAG)
+		return matches;
+
 	if (can_id & CAN_EFF_FLAG) {
 		hlist_for_each_entry_rcu(r, n, &d->rx[RX_EFF], list) {
 			if (r->can_id == can_id) {