Commit 2207afc8 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

ipv6: Move exthdr offload support into separate file 



Move the exthdr offload functionality into a separeate
file in preparate for moving it out of the module

Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5edbb07d

net/ipv6/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \ 
		raw.o protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \

		exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o



ipv6-offload :=	ip6_offload.o tcpv6_offload.o udp_offload.o

ipv6-offload :=	ip6_offload.o tcpv6_offload.o udp_offload.o exthdrs_offload.o



ipv6-$(CONFIG_SYSCTL) = sysctl_net_ipv6.o

ipv6-$(CONFIG_IPV6_MROUTE) += ip6mr.o

net/ipv6/exthdrs.c

+4 −36
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#endif



#include <asm/uaccess.h>

#include "ip6_offload.h"



int ipv6_find_tlv(struct sk_buff *skb, int offset, int type)

{
@@ -528,20 +529,12 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 


static const struct inet6_protocol rthdr_protocol = {

	.handler	=	ipv6_rthdr_rcv,

	.flags		=	INET6_PROTO_NOPOLICY | INET6_PROTO_GSO_EXTHDR,

};



static const struct net_offload rthdr_offload = {

	.flags		=	INET6_PROTO_GSO_EXTHDR,

	.flags		=	INET6_PROTO_NOPOLICY,

};



static const struct inet6_protocol destopt_protocol = {

	.handler	=	ipv6_destopt_rcv,

	.flags		=	INET6_PROTO_NOPOLICY | INET6_PROTO_GSO_EXTHDR,

};



static const struct net_offload dstopt_offload = {

	.flags		=	INET6_PROTO_GSO_EXTHDR,

	.flags		=	INET6_PROTO_NOPOLICY,

};



static const struct inet6_protocol nodata_protocol = {
@@ -549,32 +542,6 @@ static const struct inet6_protocol nodata_protocol = { 
	.flags		=	INET6_PROTO_NOPOLICY,

};



static int ipv6_exthdrs_offload_init(void)

{

	int ret;



	ret = inet6_add_offload(&rthdr_offload, IPPROTO_ROUTING);

	if (!ret)

		goto out;



	ret = inet6_add_offload(&dstopt_offload, IPPROTO_DSTOPTS);

	if (!ret)

		goto out_rt;



out:

	return ret;



out_rt:

	inet_del_offload(&rthdr_offload, IPPROTO_ROUTING);

	goto out;

}



static void ipv6_exthdrs_offload_exit(void)

{

	inet_del_offload(&rthdr_offload, IPPROTO_ROUTING);

	inet_del_offload(&rthdr_offload, IPPROTO_DSTOPTS);

}



int __init ipv6_exthdrs_init(void)

{

	int ret;
@@ -608,6 +575,7 @@ int __init ipv6_exthdrs_init(void) 


void ipv6_exthdrs_exit(void)

{

	ipv6_exthdrs_offload_exit();

	inet6_del_protocol(&nodata_protocol, IPPROTO_NONE);

	inet6_del_protocol(&destopt_protocol, IPPROTO_DSTOPTS);

	inet6_del_protocol(&rthdr_protocol, IPPROTO_ROUTING);

net/ipv6/exthdrs_offload.c

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 *	IPV6 GSO/GRO offload support

 *	Linux INET6 implementation

 *

 *	This program is free software; you can redistribute it and/or

 *      modify it under the terms of the GNU General Public License

 *      as published by the Free Software Foundation; either version

 *      2 of the License, or (at your option) any later version.

 *

 *      IPV6 Extension Header GSO/GRO support

 */

#include <net/protocol.h>

#include "ip6_offload.h"



static const struct net_offload rthdr_offload = {

	.flags		=	INET6_PROTO_GSO_EXTHDR,

};



static const struct net_offload dstopt_offload = {

	.flags		=	INET6_PROTO_GSO_EXTHDR,

};



int __init ipv6_exthdrs_offload_init(void)

{

	int ret;



	ret = inet6_add_offload(&rthdr_offload, IPPROTO_ROUTING);

	if (!ret)

		goto out;



	ret = inet6_add_offload(&dstopt_offload, IPPROTO_DSTOPTS);

	if (!ret)

		goto out_rt;



out:

	return ret;



out_rt:

	inet_del_offload(&rthdr_offload, IPPROTO_ROUTING);

	goto out;

}



void ipv6_exthdrs_offload_exit(void)

{

	inet_del_offload(&rthdr_offload, IPPROTO_ROUTING);

	inet_del_offload(&rthdr_offload, IPPROTO_DSTOPTS);

}

net/ipv6/ip6_offload.h

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
#ifndef __ip6_offload_h

#define __ip6_offload_h



int ipv6_exthdrs_offload_init(void);

void ipv6_exthdrs_offload_exit(void);



int udp_offload_init(void);

void udp_offload_cleanup(void);