Revert "pppoe: do not negotiate LCP MRU option if it is larger than 1492"

This reverts commit fc098b30.

accel-pppd/ctrl/pppoe/pppoe.c

@@ -341,7 +341,6 @@ static struct pppoe_conn_t *allocate_channel(struct pppoe_serv_t *serv, const ui
 	conn->ctrl.finished = ppp_finished;
 	conn->ctrl.terminate = ppp_terminate;
 	conn->ctrl.max_mtu = min(ETH_DATA_LEN, serv->mtu) - 8;
-	conn->ctrl.no_lcp_mru = conn->ctrl.max_mtu > (ETH_DATA_LEN - 8);
 	conn->ctrl.type = CTRL_TYPE_PPPOE;
 	conn->ctrl.ppp = 1;
 	conn->ctrl.name = "pppoe";

accel-pppd/include/ap_session.h

@@ -50,7 +50,6 @@ struct ap_ctrl {
 	char *called_station_id;
 	int dont_ifcfg:1;
 	int ppp:1;
-	int no_lcp_mru:1;
 	void (*started)(struct ap_session*);
 	void (*finished)(struct ap_session *);
 	int (*terminate)(struct ap_session *, int hard);

accel-pppd/ppp/lcp_opt_mru.c

@@ -54,21 +54,12 @@ static struct lcp_option_t *mru_init(struct ppp_lcp_t *lcp)
 	struct mru_option_t *mru_opt = _malloc(sizeof(*mru_opt));
 
 	memset(mru_opt, 0, sizeof(*mru_opt));
-	if (lcp->ppp->ses.ctrl->no_lcp_mru) {
-		mru_opt->mru = lcp->ppp->ses.ctrl->max_mtu;
-		mru_opt->mtu = lcp->ppp->ses.ctrl->max_mtu;
-		lcp->ppp->mru = mru_opt->mru;
-		lcp->ppp->mtu = mru_opt->mtu;
-		mru_opt->naked = 1;
-	} else {
-		mru_opt->mru = (conf_mru && conf_mru <= lcp->ppp->ses.ctrl->max_mtu) ? conf_mru : lcp->ppp->ses.ctrl->max_mtu;
-		if (mru_opt->mru > conf_max_mtu)
-			mru_opt->mru = conf_max_mtu;
-		mru_opt->mtu = (conf_mtu && conf_mtu <= lcp->ppp->ses.ctrl->max_mtu) ? conf_mtu : lcp->ppp->ses.ctrl->max_mtu;
-		if (mru_opt->mtu > conf_max_mtu)
-			mru_opt->mtu = conf_max_mtu;
-	}
-
+	mru_opt->mru = (conf_mru && conf_mru <= lcp->ppp->ses.ctrl->max_mtu) ? conf_mru : lcp->ppp->ses.ctrl->max_mtu;
+	if (mru_opt->mru > conf_max_mtu)
+		mru_opt->mru = conf_max_mtu;
+	mru_opt->mtu = (conf_mtu && conf_mtu <= lcp->ppp->ses.ctrl->max_mtu) ? conf_mtu : lcp->ppp->ses.ctrl->max_mtu;
+	if (mru_opt->mtu > conf_max_mtu)
+		mru_opt->mtu = conf_max_mtu;
 	mru_opt->opt.id = CI_MRU;
 	mru_opt->opt.len = 4;