aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp_generic.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ppp_generic.c')
-rw-r--r--drivers/net/ppp_generic.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index c872f7c6cce3..f5802e7b08e9 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -304,7 +304,7 @@ static const int npindex_to_proto[NUM_NP] = {
304 PPP_MPLS_UC, 304 PPP_MPLS_UC,
305 PPP_MPLS_MC, 305 PPP_MPLS_MC,
306}; 306};
307 307
308/* Translates an ethertype into an NP index */ 308/* Translates an ethertype into an NP index */
309static inline int ethertype_to_npindex(int ethertype) 309static inline int ethertype_to_npindex(int ethertype)
310{ 310{
@@ -1619,11 +1619,11 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
1619 case PPP_VJC_UNCOMP: 1619 case PPP_VJC_UNCOMP:
1620 if (ppp->vj == 0 || (ppp->flags & SC_REJ_COMP_TCP)) 1620 if (ppp->vj == 0 || (ppp->flags & SC_REJ_COMP_TCP))
1621 goto err; 1621 goto err;
1622 1622
1623 /* Until we fix the decompressor need to make sure 1623 /* Until we fix the decompressor need to make sure
1624 * data portion is linear. 1624 * data portion is linear.
1625 */ 1625 */
1626 if (!pskb_may_pull(skb, skb->len)) 1626 if (!pskb_may_pull(skb, skb->len))
1627 goto err; 1627 goto err;
1628 1628
1629 if (slhc_remember(ppp->vj, skb->data + 2, skb->len - 2) <= 0) { 1629 if (slhc_remember(ppp->vj, skb->data + 2, skb->len - 2) <= 0) {
@@ -2185,7 +2185,7 @@ ppp_ccp_peek(struct ppp *ppp, struct sk_buff *skb, int inbound)
2185 switch (CCP_CODE(dp)) { 2185 switch (CCP_CODE(dp)) {
2186 case CCP_CONFREQ: 2186 case CCP_CONFREQ:
2187 2187
2188 /* A ConfReq starts negotiation of compression 2188 /* A ConfReq starts negotiation of compression
2189 * in one direction of transmission, 2189 * in one direction of transmission,
2190 * and hence brings it down...but which way? 2190 * and hence brings it down...but which way?
2191 * 2191 *
@@ -2195,16 +2195,16 @@ ppp_ccp_peek(struct ppp *ppp, struct sk_buff *skb, int inbound)
2195 if(inbound) 2195 if(inbound)
2196 /* He is proposing what I should send */ 2196 /* He is proposing what I should send */
2197 ppp->xstate &= ~SC_COMP_RUN; 2197 ppp->xstate &= ~SC_COMP_RUN;
2198 else 2198 else
2199 /* I am proposing to what he should send */ 2199 /* I am proposing to what he should send */
2200 ppp->rstate &= ~SC_DECOMP_RUN; 2200 ppp->rstate &= ~SC_DECOMP_RUN;
2201 2201
2202 break; 2202 break;
2203 2203
2204 case CCP_TERMREQ: 2204 case CCP_TERMREQ:
2205 case CCP_TERMACK: 2205 case CCP_TERMACK:
2206 /* 2206 /*
2207 * CCP is going down, both directions of transmission 2207 * CCP is going down, both directions of transmission
2208 */ 2208 */
2209 ppp->rstate &= ~SC_DECOMP_RUN; 2209 ppp->rstate &= ~SC_DECOMP_RUN;
2210 ppp->xstate &= ~SC_COMP_RUN; 2210 ppp->xstate &= ~SC_COMP_RUN;