diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2004-01-06 05:09:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2004-01-06 05:09:37 -0800 |
| commit | 239f727a99fb0569bdcee5cf0fb9716cd2d457dc (patch) | |
| tree | 6a81d6bec13c16d2f6115a48d72df39d0e5a7da0 /include/linux/skbuff.h | |
| parent | 0c8ad9d059408e60916b8c974e1f20655c2b1810 (diff) | |
| parent | 53b78d22d516fa23f50f250cfaf6057f1824c6bc (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/network-2.6
into nuts.ninka.net:/disk1/davem/BK/net-2.6
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 77162e4c2819..b7b96854e23c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1132,7 +1132,7 @@ static inline struct sk_buff *skb_padto(struct sk_buff *skb, unsigned int len) * is returned and the old skb data released. */ extern int __skb_linearize(struct sk_buff *skb, int gfp); -static inline int __deprecated skb_linearize(struct sk_buff *skb, int gfp) +static inline int skb_linearize(struct sk_buff *skb, int gfp) { return __skb_linearize(skb, gfp); } |