diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-12-21 22:02:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-21 22:02:22 -0500 |
| commit | 1b6176cca302e2eebd2b5ce5c512282a548adbe0 (patch) | |
| tree | 0e03ebaa1e20af6b2323c158837f0d2b9651042c /net | |
| parent | ipv6: move ip6_sk_accept_pmtu from generic pmtu update path to ipv6 one (diff) | |
| parent | can: ti_hecc: Replace platform dependency with ARM dependency (diff) | |
| download | linux-dev-1b6176cca302e2eebd2b5ce5c512282a548adbe0.tar.xz linux-dev-1b6176cca302e2eebd2b5ce5c512282a548adbe0.zip | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this is a pull request of three patches for net-next/master.
There is a patch by Oliver Hartkopp, to clean up the CAN gw code.
Alexander Shiyan adds device tree support to the mcp251x driver and a
patch by Ezequiel Garcia lets the ti_hecc driver compile on all ARM
platforms.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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; |