diff options
-rw-r--r-- | drivers/message/fusion/mptlan.c | 10 | ||||
-rw-r--r-- | drivers/message/fusion/mptlan.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c index eeef0bd077f4..a13f6eecd25b 100644 --- a/drivers/message/fusion/mptlan.c +++ b/drivers/message/fusion/mptlan.c | |||
@@ -815,7 +815,7 @@ mpt_lan_wake_post_buckets_task(struct net_device *dev, int priority) | |||
815 | * @priority: 0 = put it on the timer queue, 1 = put it on the immediate queue | 815 | * @priority: 0 = put it on the timer queue, 1 = put it on the immediate queue |
816 | */ | 816 | */ |
817 | { | 817 | { |
818 | struct mpt_lan_priv *priv = dev->priv; | 818 | struct mpt_lan_priv *priv = netdev_priv(dev); |
819 | 819 | ||
820 | if (test_and_set_bit(0, &priv->post_buckets_active) == 0) { | 820 | if (test_and_set_bit(0, &priv->post_buckets_active) == 0) { |
821 | if (priority) { | 821 | if (priority) { |
@@ -834,7 +834,7 @@ mpt_lan_wake_post_buckets_task(struct net_device *dev, int priority) | |||
834 | static int | 834 | static int |
835 | mpt_lan_receive_skb(struct net_device *dev, struct sk_buff *skb) | 835 | mpt_lan_receive_skb(struct net_device *dev, struct sk_buff *skb) |
836 | { | 836 | { |
837 | struct mpt_lan_priv *priv = dev->priv; | 837 | struct mpt_lan_priv *priv = netdev_priv(dev); |
838 | 838 | ||
839 | skb->protocol = mpt_lan_type_trans(skb, dev); | 839 | skb->protocol = mpt_lan_type_trans(skb, dev); |
840 | 840 | ||
@@ -866,7 +866,7 @@ mpt_lan_receive_skb(struct net_device *dev, struct sk_buff *skb) | |||
866 | static int | 866 | static int |
867 | mpt_lan_receive_post_turbo(struct net_device *dev, u32 tmsg) | 867 | mpt_lan_receive_post_turbo(struct net_device *dev, u32 tmsg) |
868 | { | 868 | { |
869 | struct mpt_lan_priv *priv = dev->priv; | 869 | struct mpt_lan_priv *priv = netdev_priv(dev); |
870 | MPT_ADAPTER *mpt_dev = priv->mpt_dev; | 870 | MPT_ADAPTER *mpt_dev = priv->mpt_dev; |
871 | struct sk_buff *skb, *old_skb; | 871 | struct sk_buff *skb, *old_skb; |
872 | unsigned long flags; | 872 | unsigned long flags; |
@@ -921,7 +921,7 @@ static int | |||
921 | mpt_lan_receive_post_free(struct net_device *dev, | 921 | mpt_lan_receive_post_free(struct net_device *dev, |
922 | LANReceivePostReply_t *pRecvRep) | 922 | LANReceivePostReply_t *pRecvRep) |
923 | { | 923 | { |
924 | struct mpt_lan_priv *priv = dev->priv; | 924 | struct mpt_lan_priv *priv = netdev_priv(dev); |
925 | MPT_ADAPTER *mpt_dev = priv->mpt_dev; | 925 | MPT_ADAPTER *mpt_dev = priv->mpt_dev; |
926 | unsigned long flags; | 926 | unsigned long flags; |
927 | struct sk_buff *skb; | 927 | struct sk_buff *skb; |
@@ -976,7 +976,7 @@ static int | |||
976 | mpt_lan_receive_post_reply(struct net_device *dev, | 976 | mpt_lan_receive_post_reply(struct net_device *dev, |
977 | LANReceivePostReply_t *pRecvRep) | 977 | LANReceivePostReply_t *pRecvRep) |
978 | { | 978 | { |
979 | struct mpt_lan_priv *priv = dev->priv; | 979 | struct mpt_lan_priv *priv = netdev_priv(dev); |
980 | MPT_ADAPTER *mpt_dev = priv->mpt_dev; | 980 | MPT_ADAPTER *mpt_dev = priv->mpt_dev; |
981 | struct sk_buff *skb, *old_skb; | 981 | struct sk_buff *skb, *old_skb; |
982 | unsigned long flags; | 982 | unsigned long flags; |
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h index 33927ee7dc3b..c171afa93239 100644 --- a/drivers/message/fusion/mptlan.h +++ b/drivers/message/fusion/mptlan.h | |||
@@ -122,7 +122,7 @@ MODULE_DESCRIPTION(LANAME); | |||
122 | #define dlprintk(x) | 122 | #define dlprintk(x) |
123 | #endif | 123 | #endif |
124 | 124 | ||
125 | #define NETDEV_TO_LANPRIV_PTR(d) ((struct mpt_lan_priv *)(d)->priv) | 125 | #define NETDEV_TO_LANPRIV_PTR(d) ((struct mpt_lan_priv *)netdev_priv(d)) |
126 | #define NETDEV_PTR_TO_IOC_NAME_s(d) (NETDEV_TO_LANPRIV_PTR(d)->mpt_dev->name) | 126 | #define NETDEV_PTR_TO_IOC_NAME_s(d) (NETDEV_TO_LANPRIV_PTR(d)->mpt_dev->name) |
127 | #define IOC_AND_NETDEV_NAMES_s_s(d) NETDEV_PTR_TO_IOC_NAME_s(d), (d)->name | 127 | #define IOC_AND_NETDEV_NAMES_s_s(d) NETDEV_PTR_TO_IOC_NAME_s(d), (d)->name |
128 | 128 | ||