diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-19 01:00:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-19 01:00:59 -0800 |
| commit | 91af097896453718875b8f98dc86997f58620267 (patch) | |
| tree | 9f402d8f94b778d93da832cf906c24d61538e995 /include | |
| parent | f8e6976f7fe754a469efa363dbd339b03ea49d2c (diff) | |
| parent | 83902db6bfc611807a6d3d8f868c9ba01a30ad3e (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 2 | ||||
| -rw-r--r-- | include/net/dn_route.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index e364ce6c003c..8c6c375d5626 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1102,7 +1102,7 @@ static inline int skb_cow(struct sk_buff *skb, unsigned int headroom) static inline struct sk_buff *skb_padto(struct sk_buff *skb, unsigned int len) { - unsigned int size = skb->len + skb->data_len; + unsigned int size = skb->len; if (likely(size >= len)) return skb; return skb_pad(skb, len-size); diff --git a/include/net/dn_route.h b/include/net/dn_route.h index 5ad620b3623f..97b75f6a56cf 100644 --- a/include/net/dn_route.h +++ b/include/net/dn_route.h @@ -122,7 +122,7 @@ static inline void dn_nsp_send(struct sk_buff *skb) if ((dst = sk->dst_cache) && !dst->obsolete) { try_again: skb->dst = dst_clone(dst); - dst->output(skb); + dst_output(skb); return; } |