diff --git a/[refs] b/[refs]
index a342d617a6cf..ef544c09fae8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2d7ec58ac09f30ab726f216827f7c7095b2a98f
+refs/heads/master: 570e57bcbcc4df5581b1e9c806ab2b16e96ea7d3
diff --git a/trunk/include/linux/atmdev.h b/trunk/include/linux/atmdev.h
index 49a83ca900ba..43ea1b2de3ee 100644
--- a/trunk/include/linux/atmdev.h
+++ b/trunk/include/linux/atmdev.h
@@ -452,7 +452,7 @@ void atm_dev_release_vccs(struct atm_dev *dev);
 
 static inline int atm_guess_pdu2truesize(int size)
 {
-	return SKB_DATA_ALIGN(size) + sizeof(struct skb_shared_info);
+	return SKB_TRUESIZE(size);
 }