From b74a9342d29303e62341d7639067dd8f648a44fa Mon Sep 17 00:00:00 2001
From: Kristen Carlson Accardi <kristen@linux.intel.com>
Date: Mon, 12 Apr 2010 07:38:51 -0700
Subject: [PATCH] ppp: remove pfc and acfc

We will not support pfc or acfc
---
 gatchat/gatppp.c  | 26 --------------------------
 gatchat/ppp.h     |  4 ----
 gatchat/ppp_lcp.c |  6 +-----
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/gatchat/gatppp.c b/gatchat/gatppp.c
index de631322..b917ba15 100644
--- a/gatchat/gatppp.c
+++ b/gatchat/gatppp.c
@@ -60,8 +60,6 @@ struct _GAtPPP {
 	gint mru;
 	char username[256];
 	char password[256];
-	gboolean pfc;
-	gboolean acfc;
 	guint32 xmit_accm[8];
 	guint32 recv_accm;
 	GIOChannel *modem;
@@ -118,7 +116,6 @@ static void ppp_put(GAtPPP *ppp, guint8 *buf, int *pos,
 	*pos = i;
 }
 
-/* XXX implement PFC and ACFC */
 static struct frame_buffer *ppp_encode(GAtPPP *ppp, guint8 *data, int len)
 {
 	int pos = 0;
@@ -194,7 +191,6 @@ static void ppp_recv(GAtPPP *ppp, struct frame_buffer *frame)
 	};
 }
 
-/* XXX - Implement PFC and ACFC */
 static struct frame_buffer *ppp_decode(GAtPPP *ppp, guint8 *frame)
 {
 	guint8 *data;
@@ -439,26 +435,6 @@ void ppp_set_xmit_accm(GAtPPP *ppp, guint32 accm)
 	ppp->xmit_accm[0] = accm;
 }
 
-void ppp_set_pfc(GAtPPP *ppp, gboolean pfc)
-{
-	ppp->pfc = pfc;
-}
-
-gboolean ppp_get_pfc(GAtPPP *ppp)
-{
-	return ppp->pfc;
-}
-
-void ppp_set_acfc(GAtPPP *ppp, gboolean acfc)
-{
-	ppp->acfc = acfc;
-}
-
-gboolean ppp_get_acfc(GAtPPP *ppp)
-{
-	return ppp->acfc;
-}
-
 /* Administrative Open */
 void g_at_ppp_open(GAtPPP *ppp)
 {
@@ -605,8 +581,6 @@ GAtPPP *g_at_ppp_new(GIOChannel *modem)
 	ppp->recv_accm = ~0U;
 	ppp->xmit_accm[0] = ~0U;
 	ppp->xmit_accm[3] = 0x60000000; /* 0x7d, 0x7e */
-	ppp->pfc = FALSE;
-	ppp->acfc = FALSE;
 
 	ppp->index = 0;
 
diff --git a/gatchat/ppp.h b/gatchat/ppp.h
index a7b13313..4a17d4ac 100644
--- a/gatchat/ppp.h
+++ b/gatchat/ppp.h
@@ -84,10 +84,6 @@ void ppp_net_up_notify(GAtPPP *ppp, const char *ip,
 void ppp_net_down_notify(GAtPPP *ppp);
 void ppp_set_recv_accm(GAtPPP *ppp, guint32 accm);
 void ppp_set_xmit_accm(GAtPPP *ppp, guint32 accm);
-void ppp_set_pfc(GAtPPP *ppp, gboolean pfc);
-gboolean ppp_get_pfc(GAtPPP *ppp);
-void ppp_set_acfc(GAtPPP *ppp, gboolean acfc);
-gboolean ppp_get_acfc(GAtPPP *ppp);
 struct pppcp_data * lcp_new(GAtPPP *ppp);
 void lcp_free(struct pppcp_data *lcp);
 void lcp_protocol_reject(struct pppcp_data *lcp, guint8 *packet, gsize len);
diff --git a/gatchat/ppp_lcp.c b/gatchat/ppp_lcp.c
index 65c5d0bd..720db3e4 100644
--- a/gatchat/ppp_lcp.c
+++ b/gatchat/ppp_lcp.c
@@ -201,13 +201,9 @@ static enum rcr_result lcp_rcr(struct pppcp_data *pppcp,
 			ppp_set_auth(ppp, ppp_option_iter_get_data(&iter));
 			break;
 		case MAGIC_NUMBER:
-			/* don't care */
-			break;
 		case PFC:
-			ppp_set_pfc(ppp, TRUE);
-			break;
 		case ACFC:
-			ppp_set_acfc(ppp, TRUE);
+			/* don't care */
 			break;
 		}
 	}