Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / gre_demux.c

diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c
index 5893e99e82990ae75f4221249e3e5fcbceb819c4..1863422fb7d553340151b1402ee30d4be1fcde29 100644 (file)
--- a/net/ipv4/gre_demux.c
+++ b/net/ipv4/gre_demux.c
@@ -355,14 +355,7 @@ static int __init gre_init(void)
                goto err_gre;
        }
 
-       if (gre_offload_init()) {
-               pr_err("can't add protocol offload\n");
-               goto err_gso;
-       }
-
        return 0;
-err_gso:
-       gre_del_protocol(&ipgre_protocol, GREPROTO_CISCO);
 err_gre:
        inet_del_protocol(&net_gre_protocol, IPPROTO_GRE);
 err:
@@ -371,8 +364,6 @@ err:
 
 static void __exit gre_exit(void)
 {
-       gre_offload_exit();
-
        gre_del_protocol(&ipgre_protocol, GREPROTO_CISCO);
        inet_del_protocol(&net_gre_protocol, IPPROTO_GRE);
 }