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, 12 insertions, 12 deletions

diff --git a/net/802/fc.c b/net/802/fc.c
index 2a27e37bc4cb..d64e6a502958 100644
--- a/net/802/fc.c
+++ b/net/802/fc.c
@@ -1,6 +1,6 @@
 /*
  * NET3:        Fibre Channel device handling subroutines
- * 
+ *
  *              This program is free software; you can redistribute it and/or
  *              modify it under the terms of the GNU General Public License
  *              as published by the Free Software Foundation; either version
@@ -31,18 +31,18 @@
 #include <net/arp.h>
 
 /*
- *      Put the headers on a Fibre Channel packet. 
+ *      Put the headers on a Fibre Channel packet.
  */
- 
+
 static int fc_header(struct sk_buff *skb, struct net_device *dev,
                      unsigned short type,
-                     void *daddr, void *saddr, unsigned len) 
+                     void *daddr, void *saddr, unsigned len)
 {
         struct fch_hdr *fch;
         int hdr_len;
 
-        /* 
-         * Add the 802.2 SNAP header if IP as the IPv4 code calls  
+        /*
+         * Add the 802.2 SNAP header if IP as the IPv4 code calls
          * dev->hard_header directly.
          */
         if (type == ETH_P_IP || type == ETH_P_ARP)
@@ -60,7 +60,7 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev,
         else
         {
                 hdr_len = sizeof(struct fch_hdr);
-                fch = (struct fch_hdr *)skb_push(skb, hdr_len); 
+                fch = (struct fch_hdr *)skb_push(skb, hdr_len);
         }
 
         if(saddr)
@@ -68,20 +68,20 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev,
         else
                 memcpy(fch->saddr,dev->dev_addr,dev->addr_len);
 
-        if(daddr) 
+        if(daddr)
         {
                 memcpy(fch->daddr,daddr,dev->addr_len);
                 return(hdr_len);
         }
         return -hdr_len;
 }
-        
+
 /*
  *      A neighbour discovery of some species (eg arp) has completed. We
  *      can now send the packet.
  */
- 
-static int fc_rebuild_header(struct sk_buff *skb) 
+
+static int fc_rebuild_header(struct sk_buff *skb)
 {
         struct fch_hdr *fch=(struct fch_hdr *)skb->data;
         struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr));
@@ -100,7 +100,7 @@ static void fc_setup(struct net_device *dev)
 {
         dev->hard_header        = fc_header;
         dev->rebuild_header     = fc_rebuild_header;
-                
+
         dev->type               = ARPHRD_IEEE802;
         dev->hard_header_len    = FC_HLEN;
         dev->mtu                = 2024;