Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 438e38fa authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

gre_offload: statically build GRE offloading support 



GRO/GSO layers can be enabled on a node, even if said
node is only forwarding packets.

This patch permits GSO (and upcoming GRO) support for GRE
encapsulated packets, even if the host has no GRE tunnel setup.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: H.K. Jerry Chu <hkchu@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e595934

include/net/gre.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -33,9 +33,6 @@ struct gre_cisco_protocol { 
int gre_cisco_register(struct gre_cisco_protocol *proto);

int gre_cisco_register(struct gre_cisco_protocol *proto);

int gre_cisco_unregister(struct gre_cisco_protocol *proto);

int gre_cisco_unregister(struct gre_cisco_protocol *proto);





int gre_offload_init(void);

void gre_offload_exit(void);



void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi,

void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi,

		      int hdr_len);

		      int hdr_len);

net/ipv4/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ obj-y := route.o inetpeer.o protocol.o \ 
	     tcp_offload.o datagram.o raw.o udp.o udplite.o \

	     tcp_offload.o datagram.o raw.o udp.o udplite.o \

	     udp_offload.o arp.o icmp.o devinet.o af_inet.o igmp.o \

	     udp_offload.o arp.o icmp.o devinet.o af_inet.o igmp.o \

	     fib_frontend.o fib_semantics.o fib_trie.o \

	     fib_frontend.o fib_semantics.o fib_trie.o \

	     inet_fragment.o ping.o ip_tunnel_core.o

	     inet_fragment.o ping.o ip_tunnel_core.o gre_offload.o





obj-$(CONFIG_NET_IP_TUNNEL) += ip_tunnel.o

obj-$(CONFIG_NET_IP_TUNNEL) += ip_tunnel.o

obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o

obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o
@@ -19,7 +19,7 @@ obj-$(CONFIG_PROC_FS) += proc.o 
obj-$(CONFIG_IP_MULTIPLE_TABLES) += fib_rules.o

obj-$(CONFIG_IP_MULTIPLE_TABLES) += fib_rules.o

obj-$(CONFIG_IP_MROUTE) += ipmr.o

obj-$(CONFIG_IP_MROUTE) += ipmr.o

obj-$(CONFIG_NET_IPIP) += ipip.o

obj-$(CONFIG_NET_IPIP) += ipip.o

gre-y := gre_demux.o gre_offload.o

gre-y := gre_demux.o

obj-$(CONFIG_NET_IPGRE_DEMUX) += gre.o

obj-$(CONFIG_NET_IPGRE_DEMUX) += gre.o

obj-$(CONFIG_NET_IPGRE) += ip_gre.o

obj-$(CONFIG_NET_IPGRE) += ip_gre.o

obj-$(CONFIG_NET_IPVTI) += ip_vti.o

obj-$(CONFIG_NET_IPVTI) += ip_vti.o

net/ipv4/gre_demux.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -355,14 +355,7 @@ static int __init gre_init(void) 
		goto err_gre;

		goto err_gre;

	}

	}





	if (gre_offload_init()) {

		pr_err("can't add protocol offload\n");

		goto err_gso;

	}



	return 0;

	return 0;

err_gso:

	gre_del_protocol(&ipgre_protocol, GREPROTO_CISCO);

err_gre:

err_gre:

	inet_del_protocol(&net_gre_protocol, IPPROTO_GRE);

	inet_del_protocol(&net_gre_protocol, IPPROTO_GRE);

err:

err:
@@ -371,8 +364,6 @@ static int __init gre_init(void) 




static void __exit gre_exit(void)

static void __exit gre_exit(void)

{

{

	gre_offload_exit();



	gre_del_protocol(&ipgre_protocol, GREPROTO_CISCO);

	gre_del_protocol(&ipgre_protocol, GREPROTO_CISCO);

	inet_del_protocol(&net_gre_protocol, IPPROTO_GRE);

	inet_del_protocol(&net_gre_protocol, IPPROTO_GRE);

}

}

net/ipv4/gre_offload.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -123,12 +123,15 @@ static const struct net_offload gre_offload = { 
	},

	},

};

};





int __init gre_offload_init(void)

static int __init gre_offload_init(void)

{

{

	return inet_add_offload(&gre_offload, IPPROTO_GRE);

	return inet_add_offload(&gre_offload, IPPROTO_GRE);

}

}





void __exit gre_offload_exit(void)

static void __exit gre_offload_exit(void)

{

{

	inet_del_offload(&gre_offload, IPPROTO_GRE);

	inet_del_offload(&gre_offload, IPPROTO_GRE);

}

}



module_init(gre_offload_init);

module_exit(gre_offload_exit);