1 files changed, 33 insertions, 33 deletions

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index f671bb810047..2282e729edbe 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -425,8 +425,8 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
                          * network traffic (demand mode).
                          */
                         struct ppp *ppp = PF_TO_PPP(pf);
-                        if (ppp->n_channels == 0
-                            && (ppp->flags & SC_LOOP_TRAFFIC) == 0)
+                        if (ppp->n_channels == 0 &&
+                            (ppp->flags & SC_LOOP_TRAFFIC) == 0)
                                 break;
                 }
                 ret = -EAGAIN;
@@ -511,8 +511,8 @@ static unsigned int ppp_poll(struct file *file, poll_table *wait)
         else if (pf->kind == INTERFACE) {
                 /* see comment in ppp_read */
                 struct ppp *ppp = PF_TO_PPP(pf);
-                if (ppp->n_channels == 0
-                    && (ppp->flags & SC_LOOP_TRAFFIC) == 0)
+                if (ppp->n_channels == 0 &&
+                    (ppp->flags & SC_LOOP_TRAFFIC) == 0)
                         mask |= POLLIN | POLLRDNORM;
         }
 
@@ -1057,8 +1057,8 @@ ppp_xmit_process(struct ppp *ppp)
         ppp_xmit_lock(ppp);
         if (!ppp->closing) {
                 ppp_push(ppp);
-                while (!ppp->xmit_pending
-                       && (skb = skb_dequeue(&ppp->file.xq)))
+                while (!ppp->xmit_pending &&
+                       (skb = skb_dequeue(&ppp->file.xq)))
                         ppp_send_frame(ppp, skb);
                 /* If there's no work left to do, tell the core net
                    code that we can accept some more. */
@@ -1137,18 +1137,18 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
                 /* the filter instructions are constructed assuming
                    a four-byte PPP header on each packet */
                 *skb_push(skb, 2) = 1;
-                if (ppp->pass_filter
-                    && sk_run_filter(skb, ppp->pass_filter,
-                                     ppp->pass_len) == 0) {
+                if (ppp->pass_filter &&
+                    sk_run_filter(skb, ppp->pass_filter,
+                                  ppp->pass_len) == 0) {
                         if (ppp->debug & 1)
                                 printk(KERN_DEBUG "PPP: outbound frame not passed\n");
                         kfree_skb(skb);
                         return;
                 }
                 /* if this packet passes the active filter, record the time */
-                if (!(ppp->active_filter
-                      && sk_run_filter(skb, ppp->active_filter,
-                                       ppp->active_len) == 0))
+                if (!(ppp->active_filter &&
+                      sk_run_filter(skb, ppp->active_filter,
+                                    ppp->active_len) == 0))
                         ppp->last_xmit = jiffies;
                 skb_pull(skb, 2);
 #else
@@ -1202,8 +1202,8 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
         }
 
         /* try to do packet compression */
-        if ((ppp->xstate & SC_COMP_RUN) && ppp->xc_state
-            && proto != PPP_LCP && proto != PPP_CCP) {
+        if ((ppp->xstate & SC_COMP_RUN) && ppp->xc_state &&
+            proto != PPP_LCP && proto != PPP_CCP) {
                 if (!(ppp->flags & SC_CCP_UP) && (ppp->flags & SC_MUST_COMP)) {
                         if (net_ratelimit())
                                 printk(KERN_ERR "ppp: compression required but down - pkt dropped.\n");
@@ -1577,8 +1577,8 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb)
                 /* put it on the channel queue */
                 skb_queue_tail(&pch->file.rq, skb);
                 /* drop old frames if queue too long */
-                while (pch->file.rq.qlen > PPP_MAX_RQLEN
-                       && (skb = skb_dequeue(&pch->file.rq)))
+                while (pch->file.rq.qlen > PPP_MAX_RQLEN &&
+                       (skb = skb_dequeue(&pch->file.rq)))
                         kfree_skb(skb);
                 wake_up_interruptible(&pch->file.rwait);
         } else {
@@ -1654,8 +1654,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
          * Note that some decompressors need to see uncompressed frames
          * that come in as well as compressed frames.
          */
-        if (ppp->rc_state && (ppp->rstate & SC_DECOMP_RUN)
-            && (ppp->rstate & (SC_DC_FERROR | SC_DC_ERROR)) == 0)
+        if (ppp->rc_state && (ppp->rstate & SC_DECOMP_RUN) &&
+            (ppp->rstate & (SC_DC_FERROR | SC_DC_ERROR)) == 0)
                 skb = ppp_decompress_frame(ppp, skb);
 
         if (ppp->flags & SC_MUST_COMP && ppp->rstate & SC_DC_FERROR)
@@ -1726,8 +1726,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                 /* control or unknown frame - pass it to pppd */
                 skb_queue_tail(&ppp->file.rq, skb);
                 /* limit queue length by dropping old frames */
-                while (ppp->file.rq.qlen > PPP_MAX_RQLEN
-                       && (skb = skb_dequeue(&ppp->file.rq)))
+                while (ppp->file.rq.qlen > PPP_MAX_RQLEN &&
+                       (skb = skb_dequeue(&ppp->file.rq)))
                         kfree_skb(skb);
                 /* wake up any process polling or blocking on read */
                 wake_up_interruptible(&ppp->file.rwait);
@@ -1745,26 +1745,26 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                                 goto err;
 
                         *skb_push(skb, 2) = 0;
-                        if (ppp->pass_filter
-                            && sk_run_filter(skb, ppp->pass_filter,
-                                             ppp->pass_len) == 0) {
+                        if (ppp->pass_filter &&
+                            sk_run_filter(skb, ppp->pass_filter,
+                                          ppp->pass_len) == 0) {
                                 if (ppp->debug & 1)
                                         printk(KERN_DEBUG "PPP: inbound frame "
                                                "not passed\n");
                                 kfree_skb(skb);
                                 return;
                         }
-                        if (!(ppp->active_filter
-                              && sk_run_filter(skb, ppp->active_filter,
-                                               ppp->active_len) == 0))
+                        if (!(ppp->active_filter &&
+                              sk_run_filter(skb, ppp->active_filter,
+                                            ppp->active_len) == 0))
                                 ppp->last_recv = jiffies;
                         __skb_pull(skb, 2);
                 } else
 #endif /* CONFIG_PPP_FILTER */
                         ppp->last_recv = jiffies;
 
-                if ((ppp->dev->flags & IFF_UP) == 0
-                    || ppp->npmode[npi] != NPMODE_PASS) {
+                if ((ppp->dev->flags & IFF_UP) == 0 ||
+                    ppp->npmode[npi] != NPMODE_PASS) {
                         kfree_skb(skb);
                 } else {
                         /* chop off protocol */
@@ -2228,13 +2228,13 @@ ppp_set_compress(struct ppp *ppp, unsigned long arg)
         unsigned char ccp_option[CCP_MAX_OPTION_LENGTH];
 
         err = -EFAULT;
-        if (copy_from_user(&data, (void __user *) arg, sizeof(data))
-            || (data.length <= CCP_MAX_OPTION_LENGTH
-                && copy_from_user(ccp_option, (void __user *) data.ptr, data.length)))
+        if (copy_from_user(&data, (void __user *) arg, sizeof(data)) ||
+            (data.length <= CCP_MAX_OPTION_LENGTH &&
+             copy_from_user(ccp_option, (void __user *) data.ptr, data.length)))
                 goto out;
         err = -EINVAL;
-        if (data.length > CCP_MAX_OPTION_LENGTH
-            || ccp_option[1] < 2 || ccp_option[1] > data.length)
+        if (data.length > CCP_MAX_OPTION_LENGTH ||
+            ccp_option[1] < 2 || ccp_option[1] > data.length)
                 goto out;
 
         cp = try_then_request_module(