diff options
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) | |||
844 | if (!gwj->src.dev) | 844 | if (!gwj->src.dev) |
845 | goto out; | 845 | goto out; |
846 | 846 | ||
847 | /* check for CAN netdev not using header_ops - see gw_rcv() */ | 847 | if (gwj->src.dev->type != ARPHRD_CAN) |
848 | if (gwj->src.dev->type != ARPHRD_CAN || gwj->src.dev->header_ops) | ||
849 | goto put_src_out; | 848 | goto put_src_out; |
850 | 849 | ||
851 | gwj->dst.dev = dev_get_by_index(&init_net, gwj->ccgw.dst_idx); | 850 | 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) | |||
853 | if (!gwj->dst.dev) | 852 | if (!gwj->dst.dev) |
854 | goto put_src_out; | 853 | goto put_src_out; |
855 | 854 | ||
856 | /* check for CAN netdev not using header_ops - see gw_rcv() */ | 855 | if (gwj->dst.dev->type != ARPHRD_CAN) |
857 | if (gwj->dst.dev->type != ARPHRD_CAN || gwj->dst.dev->header_ops) | ||
858 | goto put_src_dst_out; | 856 | goto put_src_dst_out; |
859 | 857 | ||
860 | gwj->limit_hops = limhops; | 858 | gwj->limit_hops = limhops; |