From: hartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Date: Thu, 1 Sep 2011 09:18:54 +0000 (+0000)
Subject: Beautify check for valid CAN netdevices.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/commitdiff_plain/932abb70dd7df77d197bab86d2db49f1a2c56f60

Beautify check for valid CAN netdevices.


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

diff --git a/kernel/2.6/net/can/gw.c b/kernel/2.6/net/can/gw.c
index 5e2a459..d7257cc 100644
--- a/kernel/2.6/net/can/gw.c
+++ b/kernel/2.6/net/can/gw.c
@@ -821,10 +821,8 @@ static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,
 	if (!gwj->src.dev)
 		goto out;
 
-	if (gwj->src.dev->type != ARPHRD_CAN)
-		goto put_src_out;
-
-	if (gwj->src.dev->header_ops)
+	/* check for CAN netdev not using header_ops - see gw_rcv() */
+	if (gwj->src.dev->type != ARPHRD_CAN || gwj->src.dev->header_ops)
 		goto put_src_out;
 
 	gwj->dst.dev = dev_get_by_index(&init_net, gwj->ccgw.dst_idx);
@@ -832,10 +830,8 @@ static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,
 	if (!gwj->dst.dev)
 		goto put_src_out;
 
-	if (gwj->dst.dev->type != ARPHRD_CAN)
-		goto put_src_dst_out;
-
-	if (gwj->dst.dev->header_ops)
+	/* check for CAN netdev not using header_ops - see gw_rcv() */
+	if (gwj->dst.dev->type != ARPHRD_CAN || gwj->dst.dev->header_ops)
 		goto put_src_dst_out;
 
 	ASSERT_RTNL();