2 files changed, 9 insertions, 0 deletions

diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h
index b83114077cee..2dcf1de948ac 100644
--- a/include/net/udp_tunnel.h
+++ b/include/net/udp_tunnel.h
@@ -64,6 +64,11 @@ static inline int udp_sock_create(struct net *net,
 
 typedef int (*udp_tunnel_encap_rcv_t)(struct sock *sk, struct sk_buff *skb);
 typedef void (*udp_tunnel_encap_destroy_t)(struct sock *sk);
+typedef struct sk_buff **(*udp_tunnel_gro_receive_t)(struct sock *sk,
+                                                     struct sk_buff **head,
+                                                     struct sk_buff *skb);
+typedef int (*udp_tunnel_gro_complete_t)(struct sock *sk, struct sk_buff *skb,
+                                         int nhoff);
 
 struct udp_tunnel_sock_cfg {
         void *sk_user_data;     /* user data used by encap_rcv call back */
@@ -71,6 +76,8 @@ struct udp_tunnel_sock_cfg {
         __u8  encap_type;
         udp_tunnel_encap_rcv_t encap_rcv;
         udp_tunnel_encap_destroy_t encap_destroy;
+        udp_tunnel_gro_receive_t gro_receive;
+        udp_tunnel_gro_complete_t gro_complete;
 };
 
 /* Setup the given (UDP) sock to receive UDP encapsulated packets */
diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c
index 96599d1a1318..47f12c73d959 100644
--- a/net/ipv4/udp_tunnel.c
+++ b/net/ipv4/udp_tunnel.c
@@ -69,6 +69,8 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,
         udp_sk(sk)->encap_type = cfg->encap_type;
         udp_sk(sk)->encap_rcv = cfg->encap_rcv;
         udp_sk(sk)->encap_destroy = cfg->encap_destroy;
+        udp_sk(sk)->gro_receive = cfg->gro_receive;
+        udp_sk(sk)->gro_complete = cfg->gro_complete;
 
         udp_tunnel_encap_enable(sock);
 }