| Message ID | 1484920386-9058-1-git-send-email-jkbs@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jakub Sitnicki <jkbs@redhat.com> Date: Fri, 20 Jan 2017 14:53:06 +0100 > Commit b05229f44228 ("gre6: Cleanup GREv6 transmit path, call common GRE > functions") removed the ip6gre specific transmit function, but left the > struct ipv6_tel_txoption definition. Clean it up. > > Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> Applied, thank you.
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 75b6108..65bdfd1 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -484,11 +484,6 @@ static int gre_rcv(struct sk_buff *skb) return 0; } -struct ipv6_tel_txoption { - struct ipv6_txoptions ops; - __u8 dst_opt[8]; -}; - static int gre_handle_offloads(struct sk_buff *skb, bool csum) { return iptunnel_handle_offloads(skb,
Commit b05229f44228 ("gre6: Cleanup GREv6 transmit path, call common GRE functions") removed the ip6gre specific transmit function, but left the struct ipv6_tel_txoption definition. Clean it up. Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> --- net/ipv6/ip6_gre.c | 5 ----- 1 file changed, 5 deletions(-)