X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fnet%2Fpkt_sched.h;h=6492e7363d845355e7d4953e28c465c463b1dae4;hb=6d1d07e41a1de478a0da3cc14b4a8054ef09931c;hp=2f494a20d5123a7b8985b95c7ac7437a9d317d2d;hpb=e41a33e6ec20a0a6ac762629149e36cab5d4213f;p=linux-2.6

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 2f494a20d5..6492e7363d 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -13,13 +13,12 @@ struct qdisc_walker
 
 extern rwlock_t qdisc_tree_lock;
 
-#define	QDISC_ALIGN		32
-#define	QDISC_ALIGN_CONST	(QDISC_ALIGN - 1)
+#define QDISC_ALIGNTO		32
+#define QDISC_ALIGN(len)	(((len) + QDISC_ALIGNTO-1) & ~(QDISC_ALIGNTO-1))
 
 static inline void *qdisc_priv(struct Qdisc *q)
 {
-	return (char *)q + ((sizeof(struct Qdisc) + QDISC_ALIGN_CONST)
-			      & ~QDISC_ALIGN_CONST);
+	return (char *) q + QDISC_ALIGN(sizeof(struct Qdisc));
 }
 
 /*