Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[powerpc.git] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index 50adc91..5161e89 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -9,6 +9,7 @@
 #define _NET_DST_H
 
 #include <linux/config.h>
+#include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/rcupdate.h>
 #include <linux/jiffies.h>
@@ -42,7 +43,8 @@ struct dst_entry
        int                     __use;
        struct dst_entry        *child;
        struct net_device       *dev;
-       int                     obsolete;
+       short                   error;
+       short                   obsolete;
        int                     flags;
 #define DST_HOST               1
 #define DST_NOXFRM             2
@@ -61,8 +63,6 @@ struct dst_entry
        unsigned long           rate_last;      /* rate limiting for ICMP */
        unsigned long           rate_tokens;
 
-       int                     error;
-
        struct neighbour        *neighbour;
        struct hh_cache         *hh;
        struct xfrm_state       *xfrm;
@@ -95,7 +95,6 @@ struct dst_ops
        struct dst_entry *      (*negative_advice)(struct dst_entry *);
        void                    (*link_failure)(struct sk_buff *);
        void                    (*update_pmtu)(struct dst_entry *dst, u32 mtu);
-       int                     (*get_mss)(struct dst_entry *dst, u32 mtu);
        int                     entry_size;
 
        atomic_t                entries;
@@ -226,16 +225,7 @@ static inline void dst_set_expires(struct dst_entry *dst, int timeout)
 /* Output packet to network from transport.  */
 static inline int dst_output(struct sk_buff *skb)
 {
-       int err;
-
-       for (;;) {
-               err = skb->dst->output(skb);
-
-               if (likely(err == 0))
-                       return err;
-               if (unlikely(err != NET_XMIT_BYPASS))
-                       return err;
-       }
+       return skb->dst->output(skb);
 }
 
 /* Input packet from network to transport.  */