netdevice: safe convert to netdev_priv() #part-2
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>
This commit is contained in:

committed by
David S. Miller

parent
454d7c9b14
commit
4cf1653aa9
@@ -527,7 +527,7 @@ retry:
|
||||
|
||||
static int ibmveth_open(struct net_device *netdev)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = netdev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
||||
u64 mac_address = 0;
|
||||
int rxq_entries = 1;
|
||||
unsigned long lpar_rc;
|
||||
@@ -666,7 +666,7 @@ static int ibmveth_open(struct net_device *netdev)
|
||||
|
||||
static int ibmveth_close(struct net_device *netdev)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = netdev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
||||
long lpar_rc;
|
||||
|
||||
ibmveth_debug_printk("close starting\n");
|
||||
@@ -722,7 +722,7 @@ static u32 netdev_get_link(struct net_device *dev) {
|
||||
|
||||
static void ibmveth_set_rx_csum_flags(struct net_device *dev, u32 data)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = dev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
||||
|
||||
if (data)
|
||||
adapter->rx_csum = 1;
|
||||
@@ -741,7 +741,7 @@ static void ibmveth_set_rx_csum_flags(struct net_device *dev, u32 data)
|
||||
|
||||
static void ibmveth_set_tx_csum_flags(struct net_device *dev, u32 data)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = dev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
||||
|
||||
if (data) {
|
||||
dev->features |= NETIF_F_IP_CSUM;
|
||||
@@ -753,7 +753,7 @@ static void ibmveth_set_tx_csum_flags(struct net_device *dev, u32 data)
|
||||
static int ibmveth_set_csum_offload(struct net_device *dev, u32 data,
|
||||
void (*done) (struct net_device *, u32))
|
||||
{
|
||||
struct ibmveth_adapter *adapter = dev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
||||
u64 set_attr, clr_attr, ret_attr;
|
||||
long ret;
|
||||
int rc1 = 0, rc2 = 0;
|
||||
@@ -805,7 +805,7 @@ static int ibmveth_set_csum_offload(struct net_device *dev, u32 data,
|
||||
|
||||
static int ibmveth_set_rx_csum(struct net_device *dev, u32 data)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = dev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
||||
|
||||
if ((data && adapter->rx_csum) || (!data && !adapter->rx_csum))
|
||||
return 0;
|
||||
@@ -815,7 +815,7 @@ static int ibmveth_set_rx_csum(struct net_device *dev, u32 data)
|
||||
|
||||
static int ibmveth_set_tx_csum(struct net_device *dev, u32 data)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = dev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
||||
int rc = 0;
|
||||
|
||||
if (data && (dev->features & NETIF_F_IP_CSUM))
|
||||
@@ -833,7 +833,7 @@ static int ibmveth_set_tx_csum(struct net_device *dev, u32 data)
|
||||
|
||||
static u32 ibmveth_get_rx_csum(struct net_device *dev)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = dev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
||||
return adapter->rx_csum;
|
||||
}
|
||||
|
||||
@@ -862,7 +862,7 @@ static void ibmveth_get_ethtool_stats(struct net_device *dev,
|
||||
struct ethtool_stats *stats, u64 *data)
|
||||
{
|
||||
int i;
|
||||
struct ibmveth_adapter *adapter = dev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(ibmveth_stats); i++)
|
||||
data[i] = IBMVETH_GET_STAT(adapter, ibmveth_stats[i].offset);
|
||||
@@ -889,7 +889,7 @@ static int ibmveth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
||||
|
||||
static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = netdev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
||||
union ibmveth_buf_desc desc;
|
||||
unsigned long lpar_rc;
|
||||
unsigned long correlator;
|
||||
@@ -1044,7 +1044,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
|
||||
static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance)
|
||||
{
|
||||
struct net_device *netdev = dev_instance;
|
||||
struct ibmveth_adapter *adapter = netdev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
||||
unsigned long lpar_rc;
|
||||
|
||||
if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
|
||||
@@ -1058,7 +1058,7 @@ static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance)
|
||||
|
||||
static void ibmveth_set_multicast_list(struct net_device *netdev)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = netdev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
||||
unsigned long lpar_rc;
|
||||
|
||||
if((netdev->flags & IFF_PROMISC) || (netdev->mc_count > adapter->mcastFilterSize)) {
|
||||
@@ -1106,7 +1106,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
|
||||
|
||||
static int ibmveth_change_mtu(struct net_device *dev, int new_mtu)
|
||||
{
|
||||
struct ibmveth_adapter *adapter = dev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
||||
struct vio_dev *viodev = adapter->vdev;
|
||||
int new_mtu_oh = new_mtu + IBMVETH_BUFF_OH;
|
||||
int i;
|
||||
@@ -1158,7 +1158,7 @@ static int ibmveth_change_mtu(struct net_device *dev, int new_mtu)
|
||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
||||
static void ibmveth_poll_controller(struct net_device *dev)
|
||||
{
|
||||
ibmveth_replenish_task(dev->priv);
|
||||
ibmveth_replenish_task(netdev_priv(dev));
|
||||
ibmveth_interrupt(dev->irq, dev);
|
||||
}
|
||||
#endif
|
||||
@@ -1240,7 +1240,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
|
||||
if(!netdev)
|
||||
return -ENOMEM;
|
||||
|
||||
adapter = netdev->priv;
|
||||
adapter = netdev_priv(netdev);
|
||||
dev->dev.driver_data = netdev;
|
||||
|
||||
adapter->vdev = dev;
|
||||
@@ -1336,7 +1336,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
|
||||
static int __devexit ibmveth_remove(struct vio_dev *dev)
|
||||
{
|
||||
struct net_device *netdev = dev->dev.driver_data;
|
||||
struct ibmveth_adapter *adapter = netdev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
||||
int i;
|
||||
|
||||
for(i = 0; i<IbmVethNumBufferPools; i++)
|
||||
@@ -1470,7 +1470,7 @@ const char * buf, size_t count)
|
||||
kobj);
|
||||
struct net_device *netdev =
|
||||
container_of(kobj->parent, struct device, kobj)->driver_data;
|
||||
struct ibmveth_adapter *adapter = netdev->priv;
|
||||
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
||||
long value = simple_strtol(buf, NULL, 10);
|
||||
long rc;
|
||||
|
||||
|
Reference in New Issue
Block a user