From 57d0fcbdbf7e9d2d573ce8d4ca2f72b82f778d63 Mon Sep 17 00:00:00 2001
From: Zhaozhong Ni <nzz@google.com>
Date: Thu, 2 Aug 2018 10:41:44 -0700
Subject: Automated rollback of changelist 207037226

PiperOrigin-RevId: 207125440
Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49
---
 pkg/tcpip/header/BUILD  | 13 +------------
 pkg/tcpip/header/tcp.go |  4 ++++
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'pkg/tcpip/header')

diff --git a/pkg/tcpip/header/BUILD b/pkg/tcpip/header/BUILD
index 3aa2cfb24..8f22ba3a5 100644
--- a/pkg/tcpip/header/BUILD
+++ b/pkg/tcpip/header/BUILD
@@ -1,15 +1,6 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
-
-go_stateify(
-    name = "tcp_header_state",
-    srcs = [
-        "tcp.go",
-    ],
-    out = "tcp_header_state.go",
-    package = "header",
-)
+load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
 
 go_library(
     name = "header",
@@ -25,13 +16,11 @@ go_library(
         "ipv6.go",
         "ipv6_fragment.go",
         "tcp.go",
-        "tcp_header_state.go",
         "udp.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/tcpip/header",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/state",
         "//pkg/tcpip",
         "//pkg/tcpip/seqnum",
     ],
diff --git a/pkg/tcpip/header/tcp.go b/pkg/tcpip/header/tcp.go
index a95d282b0..6689a6dc5 100644
--- a/pkg/tcpip/header/tcp.go
+++ b/pkg/tcpip/header/tcp.go
@@ -120,6 +120,8 @@ type TCPSynOptions struct {
 }
 
 // SACKBlock represents a single contiguous SACK block.
+//
+// +stateify savable
 type SACKBlock struct {
 	// Start indicates the lowest sequence number in the block.
 	Start seqnum.Value
@@ -131,6 +133,8 @@ type SACKBlock struct {
 
 // TCPOptions are used to parse and cache the TCP segment options for a non
 // syn/syn-ack segment.
+//
+// +stateify savable
 type TCPOptions struct {
 	// TS is true if the TimeStamp option is enabled.
 	TS bool
-- 
cgit v1.2.3