From: Frank Cusack <fcusack@fcusack.com>
Date: Sun, 25 May 2003 01:56:23 +0000 (+0000)
Subject: s/opad/xpad/ to be consistent with other vars (r=recv,x=xmit)
X-Git-Tag: ppp-2.4.7~287
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;ds=sidebyside;h=3284defa36da76f04859546ba2560933a0525315;p=ppp.git

s/opad/xpad/ to be consistent with other vars (r=recv,x=xmit)
---

diff --git a/linux/mppe/linux-2.4.18-pad.patch b/linux/mppe/linux-2.4.18-pad.patch
index b5e7ea6..2d50c00 100644
--- a/linux/mppe/linux-2.4.18-pad.patch
+++ b/linux/mppe/linux-2.4.18-pad.patch
@@ -12,7 +12,7 @@
  	struct sock_fprog pass_filter;	/* filter for packets to pass */
  	struct sock_fprog active_filter;/* filter for pkts to reset idle */
  #endif /* CONFIG_PPP_FILTER */
-+	int		opad;		/* ECP or CCP (MPPE) output padding */
++	int		xpad;		/* ECP or CCP (MPPE) transmit padding */
  };
  
  /*
@@ -33,7 +33,7 @@
 -		new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len,
 -				    GFP_ATOMIC);
 +		new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len
-+				    + ppp->opad, GFP_ATOMIC);
++				    + ppp->xpad, GFP_ATOMIC);
  		if (new_skb == 0) {
  			printk(KERN_ERR "PPP: no memory (comp pkt)\n");
  			goto drop;
@@ -42,7 +42,7 @@
  		len = ppp->xcomp->compress(ppp->xc_state, skb->data - 2,
  					   new_skb->data, skb->len + 2,
 -					   ppp->dev->mtu + PPP_HDRLEN);
-+					   ppp->dev->mtu + ppp->opad
++					   ppp->dev->mtu + ppp->xpad
 +					   + PPP_HDRLEN);
  		if (len > 0 && (ppp->flags & SC_CCP_UP)) {
  			kfree_skb(skb);
@@ -101,9 +101,9 @@
 +			 * but that seems inefficient compared to this
 +			 * little trick.
 +			 */
-+			ppp->opad = MPPE_PAD;
++			ppp->xpad = MPPE_PAD;
 +		else
-+			ppp->opad = 0;
++			ppp->xpad = 0;
  
  	} else {
  		ppp_recv_lock(ppp);
diff --git a/linux/mppe/linux-2.4.19-pad.patch b/linux/mppe/linux-2.4.19-pad.patch
index 2067438..df19ee3 100644
--- a/linux/mppe/linux-2.4.19-pad.patch
+++ b/linux/mppe/linux-2.4.19-pad.patch
@@ -12,7 +12,7 @@
  	struct sock_fprog pass_filter;	/* filter for packets to pass */
  	struct sock_fprog active_filter;/* filter for pkts to reset idle */
  #endif /* CONFIG_PPP_FILTER */
-+	int		opad;		/* ECP or CCP (MPPE) output padding */
++	int		xpad;		/* ECP or CCP (MPPE) transmit padding */
  };
  
  /*
@@ -33,7 +33,7 @@
 -		new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len,
 -				    GFP_ATOMIC);
 +		new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len
-+				    + ppp->opad, GFP_ATOMIC);
++				    + ppp->xpad, GFP_ATOMIC);
  		if (new_skb == 0) {
  			printk(KERN_ERR "PPP: no memory (comp pkt)\n");
  			goto drop;
@@ -42,7 +42,7 @@
  		len = ppp->xcomp->compress(ppp->xc_state, skb->data - 2,
  					   new_skb->data, skb->len + 2,
 -					   ppp->dev->mtu + PPP_HDRLEN);
-+					   ppp->dev->mtu + ppp->opad
++					   ppp->dev->mtu + ppp->xpad
 +					   + PPP_HDRLEN);
  		if (len > 0 && (ppp->flags & SC_CCP_UP)) {
  			kfree_skb(skb);
@@ -101,9 +101,9 @@
 +			 * but that seems inefficient compared to this
 +			 * little trick.
 +			 */
-+			ppp->opad = MPPE_PAD;
++			ppp->xpad = MPPE_PAD;
 +		else
-+			ppp->opad = 0;
++			ppp->xpad = 0;
  
  	} else {
  		ppp_recv_lock(ppp);