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 <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/net/can/gw.c b/net/can/gw.c
index 3f9b0f3a281876e7d8ec7de0366ed98712759aad..88c8a39c173df1e16c2b14f0a027910a241c2ca1 100644 (file)
--- 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;