diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 02:37:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-13 02:37:49 -0500 |
commit | 454d7c9b14e20fd1949e2686e9de4a2926e01476 (patch) | |
tree | fae8bd1bfb5fd496977a0639ad71c54a2ee278ae /drivers/net/ixgbe | |
parent | 7a12122c7a00347da9669cfcde82954c9e3d6f5e (diff) |
netdevice: safe convert to netdev_priv() #part-1
We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously
netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it
directly.
This patch is a safe convert for netdev->priv to netdev_priv(netdev).
Since all of the netdev->priv is only for read.
But it is too big to be sent in one mail.
I split it to 4 parts and make every part smaller than 100,000 bytes,
which is max size allowed by vger.
Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_ethtool.c | 6 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index fee56a383819..a610016a0172 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c | |||
@@ -94,9 +94,9 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = { | |||
94 | }; | 94 | }; |
95 | 95 | ||
96 | #define IXGBE_QUEUE_STATS_LEN \ | 96 | #define IXGBE_QUEUE_STATS_LEN \ |
97 | ((((struct ixgbe_adapter *)netdev->priv)->num_tx_queues + \ | 97 | ((((struct ixgbe_adapter *)netdev_priv(netdev))->num_tx_queues + \ |
98 | ((struct ixgbe_adapter *)netdev->priv)->num_rx_queues) * \ | 98 | ((struct ixgbe_adapter *)netdev_priv(netdev))->num_rx_queues) * \ |
99 | (sizeof(struct ixgbe_queue_stats) / sizeof(u64))) | 99 | (sizeof(struct ixgbe_queue_stats) / sizeof(u64))) |
100 | #define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN) | 100 | #define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN) |
101 | #define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats) | 101 | #define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats) |
102 | #define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN) | 102 | #define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN) |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index b3be579b47ed..ae06d48e9ebb 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -4041,7 +4041,7 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev, | |||
4041 | pci_channel_state_t state) | 4041 | pci_channel_state_t state) |
4042 | { | 4042 | { |
4043 | struct net_device *netdev = pci_get_drvdata(pdev); | 4043 | struct net_device *netdev = pci_get_drvdata(pdev); |
4044 | struct ixgbe_adapter *adapter = netdev->priv; | 4044 | struct ixgbe_adapter *adapter = netdev_priv(netdev); |
4045 | 4045 | ||
4046 | netif_device_detach(netdev); | 4046 | netif_device_detach(netdev); |
4047 | 4047 | ||
@@ -4062,7 +4062,7 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev, | |||
4062 | static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) | 4062 | static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) |
4063 | { | 4063 | { |
4064 | struct net_device *netdev = pci_get_drvdata(pdev); | 4064 | struct net_device *netdev = pci_get_drvdata(pdev); |
4065 | struct ixgbe_adapter *adapter = netdev->priv; | 4065 | struct ixgbe_adapter *adapter = netdev_priv(netdev); |
4066 | 4066 | ||
4067 | if (pci_enable_device(pdev)) { | 4067 | if (pci_enable_device(pdev)) { |
4068 | DPRINTK(PROBE, ERR, | 4068 | DPRINTK(PROBE, ERR, |
@@ -4090,7 +4090,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) | |||
4090 | static void ixgbe_io_resume(struct pci_dev *pdev) | 4090 | static void ixgbe_io_resume(struct pci_dev *pdev) |
4091 | { | 4091 | { |
4092 | struct net_device *netdev = pci_get_drvdata(pdev); | 4092 | struct net_device *netdev = pci_get_drvdata(pdev); |
4093 | struct ixgbe_adapter *adapter = netdev->priv; | 4093 | struct ixgbe_adapter *adapter = netdev_priv(netdev); |
4094 | 4094 | ||
4095 | if (netif_running(netdev)) { | 4095 | if (netif_running(netdev)) { |
4096 | if (ixgbe_up(adapter)) { | 4096 | if (ixgbe_up(adapter)) { |