diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
commit | 6ab33d51713d6d60c7677c0d020910a8cb37e513 (patch) | |
tree | 546c2ff099b2757e75cf34ddace874f1220f740e /net/ipv4/ipmr.c | |
parent | 7be6065b39c3f1cfa796667eac1a2170465acc91 (diff) | |
parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
include/net/mac80211.h
net/phonet/af_phonet.c
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index ed372f3983e..ee58bcbc99a 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1954,13 +1954,14 @@ int __init ip_mr_init(void) | |||
1954 | goto proc_cache_fail; | 1954 | goto proc_cache_fail; |
1955 | #endif | 1955 | #endif |
1956 | return 0; | 1956 | return 0; |
1957 | reg_notif_fail: | ||
1958 | kmem_cache_destroy(mrt_cachep); | ||
1959 | #ifdef CONFIG_PROC_FS | 1957 | #ifdef CONFIG_PROC_FS |
1960 | proc_vif_fail: | ||
1961 | unregister_netdevice_notifier(&ip_mr_notifier); | ||
1962 | proc_cache_fail: | 1958 | proc_cache_fail: |
1963 | proc_net_remove(&init_net, "ip_mr_vif"); | 1959 | proc_net_remove(&init_net, "ip_mr_vif"); |
1960 | proc_vif_fail: | ||
1961 | unregister_netdevice_notifier(&ip_mr_notifier); | ||
1964 | #endif | 1962 | #endif |
1963 | reg_notif_fail: | ||
1964 | del_timer(&ipmr_expire_timer); | ||
1965 | kmem_cache_destroy(mrt_cachep); | ||
1965 | return err; | 1966 | return err; |
1966 | } | 1967 | } |