isdn: whitespace coding style cleanup

isdn source code uses a not-current coding style. Update the coding style used on a per-line basis so that git diff -w shows only elided blank lines at EOF. Done with emacs and some scripts and some typing. Built x86 allyesconfig. No detected change in objdump -d or size. Signed-off-by: Joe Perches <joe@perches.com>
author: Joe Perches <joe@perches.com> 2012-02-19 22:52:38 -0500
committer: Joe Perches <joe@perches.com> 2012-02-21 12:04:01 -0500
commit: 475be4d85a274d0961593db41cf85689db1d583c (patch)
tree: b2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/hisax/isdnl2.c
parent: 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff)
1 files changed, 171 insertions, 171 deletions
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index cfff0c41d298..18accb0a79cc 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -3,7 +3,7 @@
 * Author       Karsten Keil
 *              based on the teles driver from Jan den Ouden
 * Copyright    by Karsten Keil      <keil@isdn4linux.de>
- * 
+ *
 * This software may be used and distributed according to the terms
 * of the GNU General Public License, incorporated herein by reference.
 *
@@ -37,7 +37,7 @@ enum {
        ST_L2_8,
 };
-#define L2_STATE_COUNT (ST_L2_8+1)
+#define L2_STATE_COUNT (ST_L2_8 + 1)
 static char *strL2State[] =
 {
@@ -76,7 +76,7 @@ enum {
        EV_L2_FRAME_ERROR,
 };
-#define L2_EVENT_COUNT (EV_L2_FRAME_ERROR+1)
+#define L2_EVENT_COUNT (EV_L2_FRAME_ERROR + 1)
 static char *strL2Event[] =
 {
@@ -155,7 +155,7 @@ ReleaseWin(struct Layer2 *l2)
 {
        int cnt;
-        if((cnt = freewin1(l2)))
+        if ((cnt = freewin1(l2)))
                printk(KERN_WARNING "isdl2 freed %d skbuffs in release\n", cnt);
 }
@@ -164,7 +164,7 @@ cansend(struct PStack *st)
 {
        unsigned int p1;
-        if(test_bit(FLG_MOD128, &st->l2.flag))
+        if (test_bit(FLG_MOD128, &st->l2.flag))
                p1 = (st->l2.vs - st->l2.va) % 128;
        else
                p1 = (st->l2.vs - st->l2.va) % 8;
@@ -194,7 +194,7 @@ l2addrsize(struct Layer2 *l2)
 }
 static int
-sethdraddr(struct Layer2 *l2, u_char * header, int rsp)
+sethdraddr(struct Layer2 *l2, u_char *header, int rsp)
 {
        u_char *ptr = header;
        int crbit = rsp;
@@ -226,41 +226,41 @@ enqueue_super(struct PStack *st,
 #define enqueue_ui(a, b) enqueue_super(a, b)
 static inline int
-IsUI(u_char * data)
+IsUI(u_char *data)
 {
        return ((data[0] & 0xef) == UI);
 }
 static inline int
-IsUA(u_char * data)
+IsUA(u_char *data)
 {
        return ((data[0] & 0xef) == UA);
 }
 static inline int
-IsDM(u_char * data)
+IsDM(u_char *data)
 {
        return ((data[0] & 0xef) == DM);
 }
 static inline int
-IsDISC(u_char * data)
+IsDISC(u_char *data)
 {
        return ((data[0] & 0xef) == DISC);
 }
 static inline int
-IsSFrame(u_char * data, struct PStack *st)
+IsSFrame(u_char *data, struct PStack *st)
 {
        register u_char d = *data;
-        
        if (!test_bit(FLG_MOD128, &st->l2.flag))
                d &= 0xf;
-        return(((d & 0xf3) == 1) && ((d & 0x0c) != 0x0c));
+        return (((d & 0xf3) == 1) && ((d & 0x0c) != 0x0c));
 }
 static inline int
-IsSABME(u_char * data, struct PStack *st)
+IsSABME(u_char *data, struct PStack *st)
 {
        u_char d = data[0] & ~0x10;
@@ -268,19 +268,19 @@ IsSABME(u_char * data, struct PStack *st)
 }
 static inline int
-IsREJ(u_char * data, struct PStack *st)
+IsREJ(u_char *data, struct PStack *st)
 {
        return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == REJ : (data[0] & 0xf) == REJ);
 }
 static inline int
-IsFRMR(u_char * data)
+IsFRMR(u_char *data)
 {
        return ((data[0] & 0xef) == FRMR);
 }
 static inline int
-IsRNR(u_char * data, struct PStack *st)
+IsRNR(u_char *data, struct PStack *st)
 {
        return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == RNR : (data[0] & 0xf) == RNR);
 }
@@ -368,14 +368,14 @@ FRMR_error(struct PStack *st, struct sk_buff *skb)
                        return 'N';
                else
                        l2m_debug(&st->l2.l2m, "FRMR information %2x %2x %2x %2x %2x",
-                                datap[0], datap[1], datap[2],
+                                  datap[0], datap[1], datap[2],
-                                datap[3], datap[4]);
+                                  datap[3], datap[4]);
        } else {
                if (skb->len < headers + 3)
                        return 'N';
                else
                        l2m_debug(&st->l2.l2m, "FRMR information %2x %2x %2x",
-                                datap[0], datap[1], datap[2]);
+                                  datap[0], datap[1], datap[2]);
        }
        return 0;
@@ -384,9 +384,9 @@ FRMR_error(struct PStack *st, struct sk_buff *skb)
 static unsigned int
 legalnr(struct PStack *st, unsigned int nr)
 {
-        struct Layer2 *l2 = &st->l2;
+        struct Layer2 *l2 = &st->l2;
-        if(test_bit(FLG_MOD128, &l2->flag))
+        if (test_bit(FLG_MOD128, &l2->flag))
                return ((nr - l2->va) % 128) <= ((l2->vs - l2->va) % 128);
        else
                return ((nr - l2->va) % 8) <= ((l2->vs - l2->va) % 8);
@@ -402,7 +402,7 @@ setva(struct PStack *st, unsigned int nr)
        spin_lock_irqsave(&l2->lock, flags);
        while (l2->va != nr) {
                (l2->va)++;
-                if(test_bit(FLG_MOD128, &l2->flag))
+                if (test_bit(FLG_MOD128, &l2->flag))
                        l2->va %= 128;
                else
                        l2->va %= 8;
@@ -413,7 +413,7 @@ setva(struct PStack *st, unsigned int nr)
                l2->windowar[l2->sow] = NULL;
                l2->sow = (l2->sow + 1) % l2->window;
                spin_unlock_irqrestore(&l2->lock, flags);
-                if (test_bit(FLG_LLI_L2WAKEUP, &st->lli.flag) && (len >=0))
+                if (test_bit(FLG_LLI_L2WAKEUP, &st->lli.flag) && (len >= 0))
                        lli_writewakeup(st, len);
                spin_lock_irqsave(&l2->lock, flags);
        }
@@ -438,7 +438,7 @@ send_uframe(struct PStack *st, u_char cmd, u_char cr)
 }
 static inline u_char
-get_PollFlag(struct PStack * st, struct sk_buff * skb)
+get_PollFlag(struct PStack *st, struct sk_buff *skb)
 {
        return (skb->data[l2addrsize(&(st->l2))] & 0x10);
 }
@@ -470,29 +470,29 @@ restart_t200(struct PStack *st, int i)
 static inline void
 stop_t200(struct PStack *st, int i)
 {
-        if(test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
+        if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
                FsmDelTimer(&st->l2.t200, i);
 }
 static inline void
 st5_dl_release_l2l3(struct PStack *st)
 {
-                int pr;
+        int pr;
-                if(test_and_clear_bit(FLG_PEND_REL, &st->l2.flag))
+        if (test_and_clear_bit(FLG_PEND_REL, &st->l2.flag))
-                        pr = DL_RELEASE | CONFIRM;
+                pr = DL_RELEASE | CONFIRM;
-                else
+        else
-                        pr = DL_RELEASE | INDICATION;
+                pr = DL_RELEASE | INDICATION;
-                st->l2.l2l3(st, pr, NULL);
+        st->l2.l2l3(st, pr, NULL);
 }
 static inline void
 lapb_dl_release_l2l3(struct PStack *st, int f)
 {
-                if (test_bit(FLG_LAPB, &st->l2.flag))
+        if (test_bit(FLG_LAPB, &st->l2.flag))
-                        st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
+                st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
-                st->l2.l2l3(st, DL_RELEASE | f, NULL);
+        st->l2.l2l3(st, DL_RELEASE | f, NULL);
 }
 static void
@@ -557,7 +557,7 @@ l2_st8_mdl_error_dm(struct FsmInst *fi, int event, void *arg)
 static void
 l2_go_st3(struct FsmInst *fi, int event, void *arg)
 {
-        FsmChangeState(fi, ST_L2_3); 
+        FsmChangeState(fi, ST_L2_3);
 }
 static void
@@ -565,7 +565,7 @@ l2_mdl_assign(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
-        FsmChangeState(fi, ST_L2_3); 
+        FsmChangeState(fi, ST_L2_3);
        st->l2.l2tei(st, MDL_ASSIGN | INDICATION, NULL);
 }
@@ -755,7 +755,7 @@ l2_restart_multi(struct FsmInst *fi, int event, void *arg)
        if (est)
                st->l2.l2l3(st, DL_ESTABLISH | INDICATION, NULL);
-        if ((ST_L2_7==state) || (ST_L2_8 == state))
+        if ((ST_L2_7 == state) || (ST_L2_8 == state))
                if (!skb_queue_empty(&st->l2.i_queue) && cansend(st))
                        st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
 }
@@ -782,7 +782,7 @@ l2_connected(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
        struct sk_buff *skb = arg;
-        int pr=-1;
+        int pr = -1;
        if (!get_PollFlag(st, skb)) {
                l2_mdl_error_ua(fi, event, arg);
@@ -853,7 +853,7 @@ l2_st5_dm_release(struct FsmInst *fi, int event, void *arg)
        if (get_PollFlagFree(st, skb)) {
                stop_t200(st, 7);
-                if (!test_bit(FLG_L3_INIT, &st->l2.flag))
+                if (!test_bit(FLG_L3_INIT, &st->l2.flag))
                        skb_queue_purge(&st->l2.i_queue);
                if (test_bit(FLG_LAPB, &st->l2.flag))
                        st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
@@ -941,7 +941,7 @@ invoke_retransmission(struct PStack *st, unsigned int nr)
        if (l2->vs != nr) {
                while (l2->vs != nr) {
                        (l2->vs)--;
-                        if(test_bit(FLG_MOD128, &l2->flag)) {
+                        if (test_bit(FLG_MOD128, &l2->flag)) {
                                l2->vs %= 128;
                                p1 = (l2->vs - l2->va) % 128;
                        } else {
@@ -1013,7 +1013,7 @@ l2_st7_got_super(struct FsmInst *fi, int event, void *arg)
                                        EV_L2_T203, NULL, 7);
                } else if ((l2->va != nr) || (typ == RNR)) {
                        setva(st, nr);
-                        if(typ != RR) FsmDelTimer(&st->l2.t203, 9);
+                        if (typ != RR) FsmDelTimer(&st->l2.t203, 9);
                        restart_t200(st, 12);
                }
                if (!skb_queue_empty(&st->l2.i_queue) && (typ == RR))
@@ -1080,10 +1080,10 @@ l2_got_iframe(struct FsmInst *fi, int event, void *arg)
        }
        if (test_bit(FLG_OWN_BUSY, &l2->flag)) {
                dev_kfree_skb(skb);
-                if(PollFlag) enquiry_response(st);
+                if (PollFlag) enquiry_response(st);
        } else if (l2->vr == ns) {
                (l2->vr)++;
-                if(test_bit(FLG_MOD128, &l2->flag))
+                if (test_bit(FLG_MOD128, &l2->flag))
                        l2->vr %= 128;
                else
                        l2->vr %= 8;
@@ -1150,7 +1150,7 @@ l2_st5_tout_200(struct FsmInst *fi, int event, void *arg)
        struct PStack *st = fi->userdata;
        if (test_bit(FLG_LAPD, &st->l2.flag) &&
-                test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
+            test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
                FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 9);
        } else if (st->l2.rc == st->l2.N200) {
                FsmChangeState(fi, ST_L2_4);
@@ -1174,7 +1174,7 @@ l2_st6_tout_200(struct FsmInst *fi, int event, void *arg)
        struct PStack *st = fi->userdata;
        if (test_bit(FLG_LAPD, &st->l2.flag) &&
-                test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
+            test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
                FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 9);
        } else if (st->l2.rc == st->l2.N200) {
                FsmChangeState(fi, ST_L2_4);
@@ -1195,7 +1195,7 @@ l2_st7_tout_200(struct FsmInst *fi, int event, void *arg)
        struct PStack *st = fi->userdata;
        if (test_bit(FLG_LAPD, &st->l2.flag) &&
-                test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
+            test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
                FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 9);
                return;
        }
@@ -1213,7 +1213,7 @@ l2_st8_tout_200(struct FsmInst *fi, int event, void *arg)
        struct PStack *st = fi->userdata;
        if (test_bit(FLG_LAPD, &st->l2.flag) &&
-                test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
+            test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
                FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 9);
                return;
        }
@@ -1234,7 +1234,7 @@ l2_st7_tout_203(struct FsmInst *fi, int event, void *arg)
        struct PStack *st = fi->userdata;
        if (test_bit(FLG_LAPD, &st->l2.flag) &&
-                test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
+            test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
                FsmAddTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 9);
                return;
        }
@@ -1272,7 +1272,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                }
        }
        spin_lock_irqsave(&l2->lock, flags);
-        if(test_bit(FLG_MOD128, &l2->flag))
+        if (test_bit(FLG_MOD128, &l2->flag))
                p1 = (l2->vs - l2->va) % 128;
        else
                p1 = (l2->vs - l2->va) % 8;
@@ -1445,7 +1445,7 @@ static void
 l2_st14_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
-        
        skb_queue_purge(&st->l2.i_queue);
        skb_queue_purge(&st->l2.ui_queue);
        if (test_and_clear_bit(FLG_ESTAB_PEND, &st->l2.flag))
@@ -1495,7 +1495,7 @@ l2_set_own_busy(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
-        if(!test_and_set_bit(FLG_OWN_BUSY, &st->l2.flag)) {
+        if (!test_and_set_bit(FLG_OWN_BUSY, &st->l2.flag)) {
                enquiry_cr(st, RNR, RSP, 0);
                test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
        }
@@ -1506,7 +1506,7 @@ l2_clear_own_busy(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
-        if(!test_and_clear_bit(FLG_OWN_BUSY, &st->l2.flag)) {
+        if (!test_and_clear_bit(FLG_OWN_BUSY, &st->l2.flag)) {
                enquiry_cr(st, RR, RSP, 0);
                test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
        }
@@ -1631,76 +1631,76 @@ isdnl2_l1l2(struct PStack *st, int pr, void *arg)
        int c = 0;
        switch (pr) {
-                case (PH_DATA | INDICATION):
+        case (PH_DATA | INDICATION):
-                        datap = skb->data;
+                datap = skb->data;
-                        len = l2addrsize(&st->l2);
+                len = l2addrsize(&st->l2);
-                        if (skb->len > len)
+                if (skb->len > len)
-                                datap += len;
+                        datap += len;
-                        else {
+                else {
-                                FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) 'N');
+                        FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) 'N');
-                                dev_kfree_skb(skb);
+                        dev_kfree_skb(skb);
-                                return;
+                        return;
-                        }
+                }
-                        if (!(*datap & 1)) {    /* I-Frame */
+                if (!(*datap & 1)) {    /* I-Frame */
-                                if(!(c = iframe_error(st, skb)))
+                        if (!(c = iframe_error(st, skb)))
-                                        ret = FsmEvent(&st->l2.l2m, EV_L2_I, skb);
+                                ret = FsmEvent(&st->l2.l2m, EV_L2_I, skb);
-                        } else if (IsSFrame(datap, st)) {       /* S-Frame */
+                } else if (IsSFrame(datap, st)) {       /* S-Frame */
-                                if(!(c = super_error(st, skb)))
+                        if (!(c = super_error(st, skb)))
-                                        ret = FsmEvent(&st->l2.l2m, EV_L2_SUPER, skb);
+                                ret = FsmEvent(&st->l2.l2m, EV_L2_SUPER, skb);
-                        } else if (IsUI(datap)) {
+                } else if (IsUI(datap)) {
-                                if(!(c = UI_error(st, skb)))
+                        if (!(c = UI_error(st, skb)))
-                                        ret = FsmEvent(&st->l2.l2m, EV_L2_UI, skb);
+                                ret = FsmEvent(&st->l2.l2m, EV_L2_UI, skb);
-                        } else if (IsSABME(datap, st)) {
+                } else if (IsSABME(datap, st)) {
-                                if(!(c = unnum_error(st, skb, CMD)))
+                        if (!(c = unnum_error(st, skb, CMD)))
-                                        ret = FsmEvent(&st->l2.l2m, EV_L2_SABME, skb);
+                                ret = FsmEvent(&st->l2.l2m, EV_L2_SABME, skb);
-                        } else if (IsUA(datap)) {
+                } else if (IsUA(datap)) {
-                                if(!(c = unnum_error(st, skb, RSP)))
+                        if (!(c = unnum_error(st, skb, RSP)))
-                                        ret = FsmEvent(&st->l2.l2m, EV_L2_UA, skb);
+                                ret = FsmEvent(&st->l2.l2m, EV_L2_UA, skb);
-                        } else if (IsDISC(datap)) {
+                } else if (IsDISC(datap)) {
-                                if(!(c = unnum_error(st, skb, CMD)))
+                        if (!(c = unnum_error(st, skb, CMD)))
-                                        ret = FsmEvent(&st->l2.l2m, EV_L2_DISC, skb);
+                                ret = FsmEvent(&st->l2.l2m, EV_L2_DISC, skb);
-                        } else if (IsDM(datap)) {
+                } else if (IsDM(datap)) {
-                                if(!(c = unnum_error(st, skb, RSP)))
+                        if (!(c = unnum_error(st, skb, RSP)))
-                                        ret = FsmEvent(&st->l2.l2m, EV_L2_DM, skb);
+                                ret = FsmEvent(&st->l2.l2m, EV_L2_DM, skb);
-                        } else if (IsFRMR(datap)) {
+                } else if (IsFRMR(datap)) {
-                                if(!(c = FRMR_error(st,skb)))
+                        if (!(c = FRMR_error(st, skb)))
-                                        ret = FsmEvent(&st->l2.l2m, EV_L2_FRMR, skb);
+                                ret = FsmEvent(&st->l2.l2m, EV_L2_FRMR, skb);
-                        } else {
+                } else {
-                                FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) 'L');
+                        FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) 'L');
-                                dev_kfree_skb(skb);
+                        dev_kfree_skb(skb);
-                                ret = 0;
+                        ret = 0;
-                        }
+                }
-                        if(c) {
+                if (c) {
-                                dev_kfree_skb(skb);
+                        dev_kfree_skb(skb);
-                                FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *)(long)c);
+                        FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *)(long)c);
-                                ret = 0;
+                        ret = 0;
-                        }
+                }
-                        if (ret)
+                if (ret)
-                                dev_kfree_skb(skb);
+                        dev_kfree_skb(skb);
-                        break;
+                break;
-                case (PH_PULL | CONFIRM):
+        case (PH_PULL | CONFIRM):
-                        FsmEvent(&st->l2.l2m, EV_L2_ACK_PULL, arg);
+                FsmEvent(&st->l2.l2m, EV_L2_ACK_PULL, arg);
-                        break;
+                break;
-                case (PH_PAUSE | INDICATION):
+        case (PH_PAUSE | INDICATION):
-                        test_and_set_bit(FLG_DCHAN_BUSY, &st->l2.flag);
+                test_and_set_bit(FLG_DCHAN_BUSY, &st->l2.flag);
-                        break;
+                break;
-                case (PH_PAUSE | CONFIRM):
+        case (PH_PAUSE | CONFIRM):
-                        test_and_clear_bit(FLG_DCHAN_BUSY, &st->l2.flag);
+                test_and_clear_bit(FLG_DCHAN_BUSY, &st->l2.flag);
-                        break;
+                break;
-                case (PH_ACTIVATE | CONFIRM):
+        case (PH_ACTIVATE | CONFIRM):
-                case (PH_ACTIVATE | INDICATION):
+        case (PH_ACTIVATE | INDICATION):
-                        test_and_set_bit(FLG_L1_ACTIV, &st->l2.flag);
+                test_and_set_bit(FLG_L1_ACTIV, &st->l2.flag);
-                        if (test_and_clear_bit(FLG_ESTAB_PEND, &st->l2.flag))
+                if (test_and_clear_bit(FLG_ESTAB_PEND, &st->l2.flag))
-                                FsmEvent(&st->l2.l2m, EV_L2_DL_ESTABLISH_REQ, arg);
+                        FsmEvent(&st->l2.l2m, EV_L2_DL_ESTABLISH_REQ, arg);
-                        break;
+                break;
-                case (PH_DEACTIVATE | INDICATION):
+        case (PH_DEACTIVATE | INDICATION):
-                case (PH_DEACTIVATE | CONFIRM):
+        case (PH_DEACTIVATE | CONFIRM):
-                        test_and_clear_bit(FLG_L1_ACTIV, &st->l2.flag);
+                test_and_clear_bit(FLG_L1_ACTIV, &st->l2.flag);
-                        FsmEvent(&st->l2.l2m, EV_L1_DEACTIVATE, arg);
+                FsmEvent(&st->l2.l2m, EV_L1_DEACTIVATE, arg);
-                        break;
+                break;
-                default:
+        default:
-                        l2m_debug(&st->l2.l2m, "l2 unknown pr %04x", pr);
+                l2m_debug(&st->l2.l2m, "l2 unknown pr %04x", pr);
-                        break;
+                break;
        }
 }
@@ -1708,45 +1708,45 @@ static void
 isdnl2_l3l2(struct PStack *st, int pr, void *arg)
 {
        switch (pr) {
-                case (DL_DATA | REQUEST):
+        case (DL_DATA | REQUEST):
-                        if (FsmEvent(&st->l2.l2m, EV_L2_DL_DATA, arg)) {
+                if (FsmEvent(&st->l2.l2m, EV_L2_DL_DATA, arg)) {
-                                dev_kfree_skb((struct sk_buff *) arg);
+                        dev_kfree_skb((struct sk_buff *) arg);
-                        }
+                }
-                        break;
+                break;
-                case (DL_UNIT_DATA | REQUEST):
+        case (DL_UNIT_DATA | REQUEST):
-                        if (FsmEvent(&st->l2.l2m, EV_L2_DL_UNIT_DATA, arg)) {
+                if (FsmEvent(&st->l2.l2m, EV_L2_DL_UNIT_DATA, arg)) {
-                                dev_kfree_skb((struct sk_buff *) arg);
+                        dev_kfree_skb((struct sk_buff *) arg);
-                        }
+                }
-                        break;
+                break;
-                case (DL_ESTABLISH | REQUEST):
+        case (DL_ESTABLISH | REQUEST):
-                        if (test_bit(FLG_L1_ACTIV, &st->l2.flag)) {
+                if (test_bit(FLG_L1_ACTIV, &st->l2.flag)) {
-                                if (test_bit(FLG_LAPD, &st->l2.flag) ||
+                        if (test_bit(FLG_LAPD, &st->l2.flag) ||
-                                        test_bit(FLG_ORIG, &st->l2.flag)) {
+                            test_bit(FLG_ORIG, &st->l2.flag)) {
-                                        FsmEvent(&st->l2.l2m, EV_L2_DL_ESTABLISH_REQ, arg);
+                                FsmEvent(&st->l2.l2m, EV_L2_DL_ESTABLISH_REQ, arg);
-                                }
-                        } else {
-                                if (test_bit(FLG_LAPD, &st->l2.flag) ||
-                                        test_bit(FLG_ORIG, &st->l2.flag)) {
-                                        test_and_set_bit(FLG_ESTAB_PEND, &st->l2.flag);
-                                }
-                                st->l2.l2l1(st, PH_ACTIVATE, NULL);
                        }
-                        break;
+                } else {
-                case (DL_RELEASE | REQUEST):
+                        if (test_bit(FLG_LAPD, &st->l2.flag) ||
-                        if (test_bit(FLG_LAPB, &st->l2.flag)) {
+                            test_bit(FLG_ORIG, &st->l2.flag)) {
-                                st->l2.l2l1(st, PH_DEACTIVATE, NULL);
+                                test_and_set_bit(FLG_ESTAB_PEND, &st->l2.flag);
                        }
-                        FsmEvent(&st->l2.l2m, EV_L2_DL_RELEASE_REQ, arg);
+                        st->l2.l2l1(st, PH_ACTIVATE, NULL);
-                        break;
+                }
-                case (MDL_ASSIGN | REQUEST):
+                break;
-                        FsmEvent(&st->l2.l2m, EV_L2_MDL_ASSIGN, arg);
+        case (DL_RELEASE | REQUEST):
-                        break;
+                if (test_bit(FLG_LAPB, &st->l2.flag)) {
-                case (MDL_REMOVE | REQUEST):
+                        st->l2.l2l1(st, PH_DEACTIVATE, NULL);
-                        FsmEvent(&st->l2.l2m, EV_L2_MDL_REMOVE, arg);
+                }
-                        break;
+                FsmEvent(&st->l2.l2m, EV_L2_DL_RELEASE_REQ, arg);
-                case (MDL_ERROR | RESPONSE):
+                break;
-                        FsmEvent(&st->l2.l2m, EV_L2_MDL_ERROR, arg);
+        case (MDL_ASSIGN | REQUEST):
-                        break;
+                FsmEvent(&st->l2.l2m, EV_L2_MDL_ASSIGN, arg);
+                break;
+        case (MDL_REMOVE | REQUEST):
+                FsmEvent(&st->l2.l2m, EV_L2_MDL_REMOVE, arg);
+                break;
+        case (MDL_ERROR | RESPONSE):
+                FsmEvent(&st->l2.l2m, EV_L2_MDL_ERROR, arg);
+                break;
        }
 }
@@ -1787,7 +1787,7 @@ setstack_isdnl2(struct PStack *st, char *debug_id)
        if (test_bit(FLG_LAPB, &st->l2.flag))
                st->l2.l2m.state = ST_L2_4;
        else
-        st->l2.l2m.state = ST_L2_1;
+                st->l2.l2m.state = ST_L2_1;
        st->l2.l2m.debug = 0;
        st->l2.l2m.userdata = st;
        st->l2.l2m.userint = 0;
@@ -1802,16 +1802,16 @@ static void
 transl2_l3l2(struct PStack *st, int pr, void *arg)
 {
        switch (pr) {
-                case (DL_DATA | REQUEST):
+        case (DL_DATA | REQUEST):
-                case (DL_UNIT_DATA | REQUEST):
+        case (DL_UNIT_DATA | REQUEST):
-                        st->l2.l2l1(st, PH_DATA | REQUEST, arg);
+                st->l2.l2l1(st, PH_DATA | REQUEST, arg);
-                        break;
+                break;
-                case (DL_ESTABLISH | REQUEST):
+        case (DL_ESTABLISH | REQUEST):
-                        st->l2.l2l1(st, PH_ACTIVATE | REQUEST, NULL);
+                st->l2.l2l1(st, PH_ACTIVATE | REQUEST, NULL);
-                        break;
+                break;
-                case (DL_RELEASE | REQUEST):
+        case (DL_RELEASE | REQUEST):
-                        st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
+                st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
-                        break;
+                break;
        }
 }
author	Joe Perches <joe@perches.com>	2012-02-19 22:52:38 -0500
committer	Joe Perches <joe@perches.com>	2012-02-21 12:04:01 -0500
commit	475be4d85a274d0961593db41cf85689db1d583c (patch)
tree	b2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/hisax/isdnl2.c
parent	0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff)