projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd
[cascardo/linux.git]
/
net
/
ipv6
/
ip6_offload.c
diff --git
a/net/ipv6/ip6_offload.c
b/net/ipv6/ip6_offload.c
index
e893cd1
..
08b6204
100644
(file)
--- a/
net/ipv6/ip6_offload.c
+++ b/
net/ipv6/ip6_offload.c
@@
-292,8
+292,6
@@
static struct packet_offload ipv6_packet_offload __read_mostly = {
static const struct net_offload sit_offload = {
.callbacks = {
.gso_segment = ipv6_gso_segment,
- .gro_receive = ipv6_gro_receive,
- .gro_complete = ipv6_gro_complete,
},
};