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

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index edb8fc97ae11..f41f4ee0587a 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -286,7 +286,7 @@ replay:
                         goto errout;
         } else {
                 switch (n->nlmsg_type) {
-                case RTM_NEWTFILTER:    
+                case RTM_NEWTFILTER:
                         err = -EEXIST;
                         if (n->nlmsg_flags&NLM_F_EXCL)
                                 goto errout;
@@ -481,11 +481,11 @@ tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)
 
 int
 tcf_exts_validate(struct tcf_proto *tp, struct rtattr **tb,
-                  struct rtattr *rate_tlv, struct tcf_exts *exts,
-                  struct tcf_ext_map *map)
+                  struct rtattr *rate_tlv, struct tcf_exts *exts,
+                  struct tcf_ext_map *map)
 {
         memset(exts, 0, sizeof(*exts));
-        
+
 #ifdef CONFIG_NET_CLS_ACT
         {
                 int err;
@@ -511,7 +511,7 @@ tcf_exts_validate(struct tcf_proto *tp, struct rtattr **tb,
 #elif defined CONFIG_NET_CLS_POLICE
         if (map->police && tb[map->police-1]) {
                 struct tcf_police *p;
-                
+
                 p = tcf_police_locate(tb[map->police-1], rate_tlv);
                 if (p == NULL)
                         return -EINVAL;
@@ -530,7 +530,7 @@ tcf_exts_validate(struct tcf_proto *tp, struct rtattr **tb,
 
 void
 tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
-                struct tcf_exts *src)
+                struct tcf_exts *src)
 {
 #ifdef CONFIG_NET_CLS_ACT
         if (src->action) {
@@ -597,7 +597,7 @@ rtattr_failure: __attribute__ ((unused))
 
 int
 tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
-                    struct tcf_ext_map *map)
+                    struct tcf_ext_map *map)
 {
 #ifdef CONFIG_NET_CLS_ACT
         if (exts->action)