diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /include/net/dst.h | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'include/net/dst.h')
| -rw-r--r-- | include/net/dst.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index bee8b84d329d..5161e89017f9 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
| @@ -225,16 +225,7 @@ static inline void dst_set_expires(struct dst_entry *dst, int timeout) | |||
| 225 | /* Output packet to network from transport. */ | 225 | /* Output packet to network from transport. */ |
| 226 | static inline int dst_output(struct sk_buff *skb) | 226 | static inline int dst_output(struct sk_buff *skb) |
| 227 | { | 227 | { |
| 228 | int err; | 228 | return skb->dst->output(skb); |
| 229 | |||
| 230 | for (;;) { | ||
| 231 | err = skb->dst->output(skb); | ||
| 232 | |||
| 233 | if (likely(err == 0)) | ||
| 234 | return err; | ||
| 235 | if (unlikely(err != NET_XMIT_BYPASS)) | ||
| 236 | return err; | ||
| 237 | } | ||
| 238 | } | 229 | } |
| 239 | 230 | ||
| 240 | /* Input packet from network to transport. */ | 231 | /* Input packet from network to transport. */ |