summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryasuoka <yasuoka@openbsd.org>2011-10-15 02:05:07 +0000
committeryasuoka <yasuoka@openbsd.org>2011-10-15 02:05:07 +0000
commit8e845d3df7e32d42bfb3a19e07461e2b0175e5f6 (patch)
treeb0d9f8bbfdd51a1f8ada3ecec48add4546f3eb7d
parentMake ath(4) send multicast frames once, not multiple times. (diff)
downloadwireguard-openbsd-8e845d3df7e32d42bfb3a19e07461e2b0175e5f6.tar.xz
wireguard-openbsd-8e845d3df7e32d42bfb3a19e07461e2b0175e5f6.zip
Delete unused field s_first in 'struct pppoe_session' that is assigned
1 in session_new(), but it is never used. Diff from Michael W. Bombardieri henning@ claudio@ sthen@ fgsch@ deraadt@
-rw-r--r--usr.sbin/pppoe/pppoe.h3
-rw-r--r--usr.sbin/pppoe/session.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/pppoe/pppoe.h b/usr.sbin/pppoe/pppoe.h
index ddc1e1473af..359840aec04 100644
--- a/usr.sbin/pppoe/pppoe.h
+++ b/usr.sbin/pppoe/pppoe.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pppoe.h,v 1.9 2011/07/04 16:29:35 sthen Exp $ */
+/* $OpenBSD: pppoe.h,v 1.10 2011/10/15 02:05:07 yasuoka Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -110,7 +110,6 @@ struct pppoe_session {
struct ether_addr s_ea; /* remote ethernet mac */
u_int16_t s_id; /* session id */
int s_fd; /* ttyfd */
- int s_first;
};
struct pppoe_session_master {
diff --git a/usr.sbin/pppoe/session.c b/usr.sbin/pppoe/session.c
index f989fd48f90..7c960768c7b 100644
--- a/usr.sbin/pppoe/session.c
+++ b/usr.sbin/pppoe/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.3 2004/05/06 20:29:04 deraadt Exp $ */
+/* $OpenBSD: session.c,v 1.4 2011/10/15 02:05:07 yasuoka Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -91,7 +91,6 @@ session_new(struct ether_addr *ea)
s->s_id = id;
s->s_fd = -1;
- s->s_first = 1;
memcpy(&s->s_ea, ea, ETHER_ADDR_LEN);
LIST_INSERT_HEAD(&session_master.sm_sessions, s, s_next);