summaryrefslogtreecommitdiffhomepage
path: root/pkg/dhcp
diff options
context:
space:
mode:
authorKevin Krakauer <krakauer@google.com>2019-03-05 14:52:35 -0800
committerShentubot <shentubot@google.com>2019-03-05 14:53:34 -0800
commit23e66ee96d159a774ecac9f89fab8cff463174a4 (patch)
treebba2633c3fbf9ee15da6655311fe83242b250036 /pkg/dhcp
parentbd46185e24e03b93ac551a5ddfffb06975f157c8 (diff)
Remove unused commit() function argument to Bind.
PiperOrigin-RevId: 236926132 Change-Id: I5cf103f22766e6e65a581de780c7bb9ca0fa3181
Diffstat (limited to 'pkg/dhcp')
-rw-r--r--pkg/dhcp/client.go2
-rw-r--r--pkg/dhcp/dhcp_test.go2
-rw-r--r--pkg/dhcp/server.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkg/dhcp/client.go b/pkg/dhcp/client.go
index fb3ae5b49..354205e63 100644
--- a/pkg/dhcp/client.go
+++ b/pkg/dhcp/client.go
@@ -140,7 +140,7 @@ func (c *Client) Request(ctx context.Context, requestedAddr tcpip.Address) (cfg
Addr: tcpipHeader.IPv4Any,
Port: ClientPort,
NIC: c.nicid,
- }, nil); err != nil {
+ }); err != nil {
return Config{}, fmt.Errorf("dhcp: Bind(): %s", err)
}
diff --git a/pkg/dhcp/dhcp_test.go b/pkg/dhcp/dhcp_test.go
index 026064394..e1d8ef603 100644
--- a/pkg/dhcp/dhcp_test.go
+++ b/pkg/dhcp/dhcp_test.go
@@ -284,7 +284,7 @@ func TestTwoServers(t *testing.T) {
if err != nil {
t.Fatalf("dhcp: server endpoint: %v", err)
}
- if err = ep.Bind(tcpip.FullAddress{Port: ServerPort}, nil); err != nil {
+ if err = ep.Bind(tcpip.FullAddress{Port: ServerPort}); err != nil {
t.Fatalf("dhcp: server bind: %v", err)
}
if err = ep.SetSockOpt(tcpip.BroadcastOption(1)); err != nil {
diff --git a/pkg/dhcp/server.go b/pkg/dhcp/server.go
index c72c3b70d..9549ff705 100644
--- a/pkg/dhcp/server.go
+++ b/pkg/dhcp/server.go
@@ -120,7 +120,7 @@ func newEPConnServer(ctx context.Context, stack *stack.Stack, addrs []tcpip.Addr
if err != nil {
return nil, fmt.Errorf("dhcp: server endpoint: %v", err)
}
- if err := ep.Bind(tcpip.FullAddress{Port: ServerPort}, nil); err != nil {
+ if err := ep.Bind(tcpip.FullAddress{Port: ServerPort}); err != nil {
return nil, fmt.Errorf("dhcp: server bind: %v", err)
}
if err := ep.SetSockOpt(tcpip.BroadcastOption(1)); err != nil {