From 03ff9b8bf01a87dcbae9b463f4994301174fc541 Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Mon, 18 Mar 2013 07:52:06 +0000 Subject: [PATCH] --- yaml --- r: 368310 b: refs/heads/master c: c9bbb75f1dffef0e6ac47abf32cdb668d5e1a867 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/can/af_can.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index dc63a44a0bfc..905fc2646d8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bc277f79260ae6f0888b1234942b6aedfff1289 +refs/heads/master: c9bbb75f1dffef0e6ac47abf32cdb668d5e1a867 diff --git a/trunk/net/can/af_can.c b/trunk/net/can/af_can.c index 8bacf281b3ee..c4e50852c9f4 100644 --- a/trunk/net/can/af_can.c +++ b/trunk/net/can/af_can.c @@ -546,16 +546,13 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask, } /* - * Check for bugs in CAN protocol implementations: - * If no matching list item was found, the list cursor variable next - * will be NULL, while r will point to the last item of the list. + * Check for bugs in CAN protocol implementations using af_can.c: + * 'r' will be NULL if no matching list item was found for removal. */ if (!r) { - pr_err("BUG: receive list entry not found for " - "dev %s, id %03X, mask %03X\n", - DNAME(dev), can_id, mask); - r = NULL; + WARN(1, "BUG: receive list entry not found for dev %s, " + "id %03X, mask %03X\n", DNAME(dev), can_id, mask); goto out; }