foreign-master: remove unused field

The field was only to be set and reported, not really used. We definitely need a way to age potential masters, but counting announce messages without expiration is not the way. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

foreign-master: remove unused field
The field was only to be set and reported, not really used. We definitely need a way to age potential masters, but counting announce messages without expiration is not the way. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
8d253456 · Alessandro Rubini · a200883a · 8d253456 · 8d253456
Commit 8d253456 authored Mar 07, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

pp-instance.h include/ppsi/pp-instance.h +0 -2

common-fun.c proto-standard/common-fun.c +0 -5

No files found.
--- a/include/ppsi/pp-instance.h
+++ b/include/ppsi/pp-instance.h
@@ -60,8 +60,6 @@ struct pp_channel {
 */
 struct pp_frgn_master {
 	PortIdentity port_identity;
-	UInteger16 ann_messages;
 	//This one is not in the spec
 	MsgAnnounce ann;
 	MsgHeader hdr;

--- a/proto-standard/common-fun.c
+++ b/proto-standard/common-fun.c
@@ -92,11 +92,7 @@ static void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
 		     ppi->frgn_master[j].port_identity.portNumber)) {
 			/* Foreign Master is already in Foreign master data set
 			 */
-			ppi->frgn_master[j].ann_messages++;
 			found = 1;
-			PP_VPRINTF("st_com_add_foreign: ann_messages: %d\n",
-				ppi->frgn_master[j].ann_messages);
 			msg_copy_header(&ppi->frgn_master[j].hdr, hdr);
 			msg_unpack_announce(buf, &ppi->frgn_master[j].ann);
 			break;
@@ -121,7 +117,6 @@ static void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
 		PP_CLOCK_IDENTITY_LENGTH);
 	ppi->frgn_master[j].port_identity.portNumber =
 		hdr->sourcePortIdentity.portNumber;
-	ppi->frgn_master[j].ann_messages = 0;
 	/*
 	 * header and announce field of each Foreign Master are