diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 08:59:19 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 08:59:19 -0400 |
| commit | 2f540738f8d228016c6cd0d3b303896c174ecee3 (patch) | |
| tree | 7e6574c041ac4386763f94d3d401d70f4ab6f55b /net/ipv6/ip6mr.c | |
| parent | a3849a4c038a21075a0bc7eaf37f65a93976d10c (diff) | |
| parent | d8e9c00e38f6947cef7f5466a0a3d369461ab97f (diff) | |
Merge branch 'tegra/cleanup' into next/cleanup
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 705c82886281..def0538e2413 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
| @@ -696,8 +696,10 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, | |||
| 696 | int err; | 696 | int err; |
| 697 | 697 | ||
| 698 | err = ip6mr_fib_lookup(net, &fl6, &mrt); | 698 | err = ip6mr_fib_lookup(net, &fl6, &mrt); |
| 699 | if (err < 0) | 699 | if (err < 0) { |
| 700 | kfree_skb(skb); | ||
| 700 | return err; | 701 | return err; |
| 702 | } | ||
| 701 | 703 | ||
| 702 | read_lock(&mrt_lock); | 704 | read_lock(&mrt_lock); |
| 703 | dev->stats.tx_bytes += skb->len; | 705 | dev->stats.tx_bytes += skb->len; |
| @@ -2052,8 +2054,10 @@ int ip6_mr_input(struct sk_buff *skb) | |||
| 2052 | int err; | 2054 | int err; |
| 2053 | 2055 | ||
| 2054 | err = ip6mr_fib_lookup(net, &fl6, &mrt); | 2056 | err = ip6mr_fib_lookup(net, &fl6, &mrt); |
| 2055 | if (err < 0) | 2057 | if (err < 0) { |
| 2058 | kfree_skb(skb); | ||
| 2056 | return err; | 2059 | return err; |
| 2060 | } | ||
| 2057 | 2061 | ||
| 2058 | read_lock(&mrt_lock); | 2062 | read_lock(&mrt_lock); |
| 2059 | cache = ip6mr_cache_find(mrt, | 2063 | cache = ip6mr_cache_find(mrt, |