Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
  [IPV4]: Restore multipath routing after rt_next changes.
  [XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
  [NET]: Reorder fields of struct dst_entry
  [DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
  [IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
  [IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
  [NET]: Introduce union in struct dst_entry to hold 'next' pointer
  [DECNET]: fix misannotation of linkinfo_dn
  [DECNET]: FRA_{DST,SRC} are le16 for decnet
  [UDP]: UDP can use sk_hash to speedup lookups
  [NET]: Fix whitespace errors.
  [NET] XFRM: Fix whitespace errors.
  [NET] X25: Fix whitespace errors.
  [NET] WANROUTER: Fix whitespace errors.
  [NET] UNIX: Fix whitespace errors.
  [NET] TIPC: Fix whitespace errors.
  [NET] SUNRPC: Fix whitespace errors.
  [NET] SCTP: Fix whitespace errors.
  [NET] SCHED: Fix whitespace errors.
  [NET] RXRPC: Fix whitespace errors.
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c
index 8b5eefd70f0..b8739cf9156 100644
--- a/net/lapb/lapb_subr.c
+++ b/net/lapb/lapb_subr.c
@@ -59,7 +59,7 @@ void lapb_frames_acked(struct lapb_cb *lapb, unsigned short nr)
          */
         if (lapb->va != nr)
                 while (skb_peek(&lapb->ack_queue) && lapb->va != nr) {
-                        skb = skb_dequeue(&lapb->ack_queue);
+                        skb = skb_dequeue(&lapb->ack_queue);
                         kfree_skb(skb);
                         lapb->va = (lapb->va + 1) % modulus;
                 }
@@ -67,7 +67,7 @@ void lapb_frames_acked(struct lapb_cb *lapb, unsigned short nr)
 
 void lapb_requeue_frames(struct lapb_cb *lapb)
 {
-        struct sk_buff *skb, *skb_prev = NULL;
+        struct sk_buff *skb, *skb_prev = NULL;
 
         /*
          * Requeue all the un-ack-ed frames on the output queue to be picked
@@ -91,7 +91,7 @@ int lapb_validate_nr(struct lapb_cb *lapb, unsigned short nr)
 {
         unsigned short vc = lapb->va;
         int modulus;
-        
+
         modulus = (lapb->mode & LAPB_EXTENDED) ? LAPB_EMODULUS : LAPB_SMODULUS;
 
         while (vc != lapb->vs) {
@@ -99,7 +99,7 @@ int lapb_validate_nr(struct lapb_cb *lapb, unsigned short nr)
                         return 1;
                 vc = (vc + 1) % modulus;
         }
-        
+
         return nr == lapb->vs;
 }
 
@@ -149,7 +149,7 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb,
                                 frame->cr = LAPB_RESPONSE;
                 }
         }
-                
+
         skb_pull(skb, 1);
 
         if (lapb->mode & LAPB_EXTENDED) {
@@ -220,9 +220,9 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb,
         return 0;
 }
 
-/* 
+/*
  *      This routine is called when the HDLC layer internally  generates a
- *      command or  response  for  the remote machine ( eg. RR, UA etc. ). 
+ *      command or  response  for  the remote machine ( eg. RR, UA etc. ).
  *      Only supervisory or unnumbered frames are processed, FRMRs are handled
  *      by lapb_transmit_frmr below.
  */
@@ -259,7 +259,7 @@ void lapb_send_control(struct lapb_cb *lapb, int frametype,
         lapb_transmit_buffer(lapb, skb, type);
 }
 
-/* 
+/*
  *      This routine generates FRMRs based on information previously stored in
  *      the LAPB control block.
  */