From: Oliver Hartkopp Date: Wed, 4 Dec 2013 18:52:36 +0000 (+0100) Subject: can: gw: remove obsolete checks X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0ebbdd6b57949775d428f00b8696a4078f86ac4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git can: gw: remove obsolete checks In commit be286bafe1f4069094865264f29805854c5788bf ("can: gw: add a variable limit for CAN frame routings") the detection of the frame routing has been changed. The former solution required dev->header_ops to be unused (== NULL). I missed to remove the obsolete checks in the original commit - so here it is. Signed-off-by: Oliver Hartkopp Signed-off-by: Marc Kleine-Budde --- diff --git a/net/can/gw.c b/net/can/gw.c index 3f9b0f3a2818..88c8a39c173d 100644 --- a/net/can/gw.c +++ b/net/can/gw.c @@ -844,8 +844,7 @@ static int cgw_create_job(struct sk_buff *skb, struct nlmsghdr *nlh) if (!gwj->src.dev) goto out; - /* check for CAN netdev not using header_ops - see gw_rcv() */ - if (gwj->src.dev->type != ARPHRD_CAN || gwj->src.dev->header_ops) + if (gwj->src.dev->type != ARPHRD_CAN) goto put_src_out; gwj->dst.dev = dev_get_by_index(&init_net, gwj->ccgw.dst_idx); @@ -853,8 +852,7 @@ static int cgw_create_job(struct sk_buff *skb, struct nlmsghdr *nlh) if (!gwj->dst.dev) goto put_src_out; - /* check for CAN netdev not using header_ops - see gw_rcv() */ - if (gwj->dst.dev->type != ARPHRD_CAN || gwj->dst.dev->header_ops) + if (gwj->dst.dev->type != ARPHRD_CAN) goto put_src_dst_out; gwj->limit_hops = limhops;