diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2013-12-04 19:52:36 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-12-21 14:56:21 +0100 |
| commit | c0ebbdd6b57949775d428f00b8696a4078f86ac4 (patch) | |
| tree | 8af4fe6cc50bef0f182043821ce17119c3f59ccc /net/can | |
| parent | ac7686b9698038cdf5148c9904db907448dceca4 (diff) | |
| download | linux-stable-c0ebbdd6b57949775d428f00b8696a4078f86ac4.tar.gz linux-stable-c0ebbdd6b57949775d428f00b8696a4078f86ac4.tar.bz2 linux-stable-c0ebbdd6b57949775d428f00b8696a4078f86ac4.zip | |
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>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/gw.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; |