diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2004-04-14 12:50:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-04-14 12:50:03 -0400 |
| commit | 5d4bb599d8bc0e53eb6ee1e2049353f34c66c0f2 (patch) | |
| tree | 3883cd90c34a51b155cc4724af5b16b1eda4f2d6 /include/linux | |
| parent | 62e88cfdeabf75516364a9ab914c4120b4a25221 (diff) | |
| parent | fb320b95ffb2f406ccff907f60704cd88ff2c047 (diff) | |
Merge redhat.com:/spare/repo/netdev-2.6/janitor
into redhat.com:/spare/repo/net-drivers-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 378777e11e94..5c5a551fe630 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -484,9 +484,14 @@ struct net_device int padded; }; +#define NETDEV_ALIGN 32 +#define NETDEV_ALIGN_CONST (NETDEV_ALIGN - 1) + static inline void *netdev_priv(struct net_device *dev) { - return (char *)dev + ((sizeof(struct net_device) + 31) & ~31); + return (char *)dev + ((sizeof(struct net_device) + + NETDEV_ALIGN_CONST) + & ~NETDEV_ALIGN_CONST); } #define SET_MODULE_OWNER(dev) do { } while (0) |