diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-05-27 00:42:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-27 18:47:06 -0400 |
commit | 1ce8e7b57b3a4527ef83da1c5c7bd8a6b9d87b56 (patch) | |
tree | 095536a47e40fdb621c1f959637fa63f57a4ccf2 /net/mac80211/main.c | |
parent | 0bb32417ff0f6ac385e4eec3ef6641950bbb3694 (diff) |
net: ALIGN/PTR_ALIGN cleanup in alloc_netdev_mq()/netdev_priv()
Use ALIGN() and PTR_ALIGN() macros instead of handcoding them.
Get rid of NETDEV_ALIGN_CONST ugly define
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 6b7e92eaab47..e37770ced53c 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -735,9 +735,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, | |||
735 | * +-------------------------+ | 735 | * +-------------------------+ |
736 | * | 736 | * |
737 | */ | 737 | */ |
738 | priv_size = ((sizeof(struct ieee80211_local) + | 738 | priv_size = ALIGN(sizeof(*local), NETDEV_ALIGN) + priv_data_len; |
739 | NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST) + | ||
740 | priv_data_len; | ||
741 | 739 | ||
742 | wiphy = wiphy_new(&mac80211_config_ops, priv_size); | 740 | wiphy = wiphy_new(&mac80211_config_ops, priv_size); |
743 | 741 | ||
@@ -754,9 +752,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, | |||
754 | 752 | ||
755 | local->hw.wiphy = wiphy; | 753 | local->hw.wiphy = wiphy; |
756 | 754 | ||
757 | local->hw.priv = (char *)local + | 755 | local->hw.priv = (char *)local + ALIGN(sizeof(*local), NETDEV_ALIGN); |
758 | ((sizeof(struct ieee80211_local) + | ||
759 | NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST); | ||
760 | 756 | ||
761 | BUG_ON(!ops->tx); | 757 | BUG_ON(!ops->tx); |
762 | BUG_ON(!ops->start); | 758 | BUG_ON(!ops->start); |