diff options
| -rw-r--r-- | net/decnet/dn_route.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index ad2efa5b861b..ce0cbbfe0f43 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
| @@ -1666,12 +1666,8 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh) | |||
| 1666 | 1666 | ||
| 1667 | if (fld.flowidn_iif) { | 1667 | if (fld.flowidn_iif) { |
| 1668 | struct net_device *dev; | 1668 | struct net_device *dev; |
| 1669 | if ((dev = dev_get_by_index(&init_net, fld.flowidn_iif)) == NULL) { | 1669 | dev = __dev_get_by_index(&init_net, fld.flowidn_iif); |
| 1670 | kfree_skb(skb); | 1670 | if (!dev || !dev->dn_ptr) { |
| 1671 | return -ENODEV; | ||
| 1672 | } | ||
| 1673 | if (!dev->dn_ptr) { | ||
| 1674 | dev_put(dev); | ||
| 1675 | kfree_skb(skb); | 1671 | kfree_skb(skb); |
| 1676 | return -ENODEV; | 1672 | return -ENODEV; |
| 1677 | } | 1673 | } |
| @@ -1693,8 +1689,6 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh) | |||
| 1693 | err = dn_route_output_key((struct dst_entry **)&rt, &fld, 0); | 1689 | err = dn_route_output_key((struct dst_entry **)&rt, &fld, 0); |
| 1694 | } | 1690 | } |
| 1695 | 1691 | ||
| 1696 | if (skb->dev) | ||
| 1697 | dev_put(skb->dev); | ||
| 1698 | skb->dev = NULL; | 1692 | skb->dev = NULL; |
| 1699 | if (err) | 1693 | if (err) |
| 1700 | goto out_free; | 1694 | goto out_free; |
