svn commit: r187982 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netgraph

[Alexander Motin]

Author: mav
Date: Sun Feb  1 10:13:18 2009
New Revision: 187982
URL: http://svn.freebsd.org/changeset/base/187982

Log:
  MFC rev. 187387
  
    Remove strict limitation on minimal multilink MRRU. RFC claims that MRRU
    of 1500 must be supported, but allows smaller values to be negotiated.
    Enforce specified MRRU for outgoing frames.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netgraph/ng_ppp.c

Modified: stable/7/sys/netgraph/ng_ppp.c
==============================================================================
--- stable/7/sys/netgraph/ng_ppp.c	Sun Feb  1 09:59:10 2009	(r187981)
+++ stable/7/sys/netgraph/ng_ppp.c	Sun Feb  1 10:13:18 2009	(r187982)
@@ -128,7 +128,6 @@ MALLOC_DEFINE(M_NETGRAPH_PPP, "netgraph_
 #define PROT_VJUNCOMP		0x002f
 
 /* Multilink PPP definitions */
-#define MP_MIN_MRRU		1500		/* per RFC 1990 */
 #define MP_INITIAL_SEQ		0		/* per RFC 1990 */
 #define MP_MIN_LINK_MRU		32
 
@@ -1985,6 +1984,12 @@ ng_ppp_mp_xmit(node_p node, item_p item,
 		    priv->activeLinks[0], plen));
 	}
 
+	/* Check peer's MRRU for this bundle. */
+	if (plen > priv->conf.mrru) {
+		NG_FREE_ITEM(item);
+		return (EMSGSIZE);
+	}
+
 	/* Extract mbuf. */
 	NGI_GET_M(item, m);
 
@@ -2540,10 +2545,6 @@ ng_ppp_config_valid(node_p node, const s
 			return (0);
 	}
 
-	/* Check bundle parameters */
-	if (newConf->bund.enableMultilink && newConf->bund.mrru < MP_MIN_MRRU)
-		return (0);
-
 	/* Disallow changes to multi-link configuration while MP is active */
 	if (priv->numActiveLinks > 0 && newNumLinksActive > 0) {
 		if (!priv->conf.enableMultilink