Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0ebbdd6 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: gw: remove obsolete checks 



In commit be286baf ("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: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ac7686b9

net/can/gw.c

+2 −4
Original line number Diff line number Diff line
@@ -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;