Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / net / x25 / x25_link.c

diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index 21306928d47f2a185dee95f34ed76412979d9aad..037958ff8eeddad91ffee7040c457bd5ebb16475 100644 (file)
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -76,30 +76,29 @@ void x25_link_control(struct sk_buff *skb, struct x25_neigh *nb,
        int confirm;
 
        switch (frametype) {
-               case X25_RESTART_REQUEST:
-                       confirm = !x25_t20timer_pending(nb);
-                       x25_stop_t20timer(nb);
-                       nb->state = X25_LINK_STATE_3;
-                       if (confirm)
-                               x25_transmit_restart_confirmation(nb);
-                       break;
-
-               case X25_RESTART_CONFIRMATION:
-                       x25_stop_t20timer(nb);
-                       nb->state = X25_LINK_STATE_3;
-                       break;
-
-               case X25_DIAGNOSTIC:
-                       printk(KERN_WARNING "x25: diagnostic #%d - "
-                              "%02X %02X %02X\n",
-                              skb->data[3], skb->data[4],
-                              skb->data[5], skb->data[6]);
-                       break;
-
-               default:
-                       printk(KERN_WARNING "x25: received unknown %02X "
-                              "with LCI 000\n", frametype);
-                       break;
+       case X25_RESTART_REQUEST:
+               confirm = !x25_t20timer_pending(nb);
+               x25_stop_t20timer(nb);
+               nb->state = X25_LINK_STATE_3;
+               if (confirm)
+                       x25_transmit_restart_confirmation(nb);
+               break;
+
+       case X25_RESTART_CONFIRMATION:
+               x25_stop_t20timer(nb);
+               nb->state = X25_LINK_STATE_3;
+               break;
+
+       case X25_DIAGNOSTIC:
+               printk(KERN_WARNING "x25: diagnostic #%d - %02X %02X %02X\n",
+                      skb->data[3], skb->data[4],
+                      skb->data[5], skb->data[6]);
+               break;
+
+       default:
+               printk(KERN_WARNING "x25: received unknown %02X with LCI 000\n",
+                      frametype);
+               break;
        }
 
        if (nb->state == X25_LINK_STATE_3)
@@ -193,18 +192,18 @@ void x25_transmit_clear_request(struct x25_neigh *nb, unsigned int lci,
 void x25_transmit_link(struct sk_buff *skb, struct x25_neigh *nb)
 {
        switch (nb->state) {
-               case X25_LINK_STATE_0:
-                       skb_queue_tail(&nb->queue, skb);
-                       nb->state = X25_LINK_STATE_1;
-                       x25_establish_link(nb);
-                       break;
-               case X25_LINK_STATE_1:
-               case X25_LINK_STATE_2:
-                       skb_queue_tail(&nb->queue, skb);
-                       break;
-               case X25_LINK_STATE_3:
-                       x25_send_frame(skb, nb);
-                       break;
+       case X25_LINK_STATE_0:
+               skb_queue_tail(&nb->queue, skb);
+               nb->state = X25_LINK_STATE_1;
+               x25_establish_link(nb);
+               break;
+       case X25_LINK_STATE_1:
+       case X25_LINK_STATE_2:
+               skb_queue_tail(&nb->queue, skb);
+               break;
+       case X25_LINK_STATE_3:
+               x25_send_frame(skb, nb);
+               break;
        }
 }
 
@@ -214,14 +213,14 @@ void x25_transmit_link(struct sk_buff *skb, struct x25_neigh *nb)
 void x25_link_established(struct x25_neigh *nb)
 {
        switch (nb->state) {
-               case X25_LINK_STATE_0:
-                       nb->state = X25_LINK_STATE_2;
-                       break;
-               case X25_LINK_STATE_1:
-                       x25_transmit_restart_request(nb);
-                       nb->state = X25_LINK_STATE_2;
-                       x25_start_t20timer(nb);
-                       break;
+       case X25_LINK_STATE_0:
+               nb->state = X25_LINK_STATE_2;
+               break;
+       case X25_LINK_STATE_1:
+               x25_transmit_restart_request(nb);
+               nb->state = X25_LINK_STATE_2;
+               x25_start_t20timer(nb);
+               break;
        }
 }