please apply to 2.6 and 2.4 kernels.
thanks!
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1331.3.3 -> 1.1331.3.4
# include/linux/atmdev.h 1.13 -> 1.14
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/04/07 chas@xxxxxxxxxxxxxxxxxxxxxx 1.1331.3.4
# [ATM]: get atm_guess_pdu2truesize() right
# --------------------------------------------
#
diff -Nru a/include/linux/atmdev.h b/include/linux/atmdev.h
--- a/include/linux/atmdev.h Wed Apr 7 08:01:57 2004
+++ b/include/linux/atmdev.h Wed Apr 7 08:01:57 2004
@@ -411,9 +411,9 @@
*
*/
-static inline int atm_guess_pdu2truesize(int pdu_size)
+static inline int atm_guess_pdu2truesize(int size)
{
- return ((pdu_size+15) & ~15) + sizeof(struct sk_buff);
+ return (SKB_DATA_ALIGN(size) + sizeof(struct skb_shared_info));
}
|