Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c719871 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[PATCH] ibmveth: Remove ibmveth "liobn" field 



Remove the now unused "liobn" field in ibmveth which also avoids
having insider knowledge of the iommu table in that driver.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarSantiago Leon <santil@us.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 96289b07

drivers/net/ibmveth.c

+0 −4
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include <asm/semaphore.h>

#include <asm/hvcall.h>

#include <asm/atomic.h>

#include <asm/iommu.h>

#include <asm/vio.h>

#include <asm/uaccess.h>

#include <linux/seq_file.h>
@@ -1000,8 +999,6 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_ 
	adapter->mac_addr = 0;

	memcpy(&adapter->mac_addr, mac_addr_p, 6);



	adapter->liobn = dev->iommu_table->it_index;



	netdev->irq = dev->irq;

	netdev->open               = ibmveth_open;

	netdev->poll               = ibmveth_poll;
@@ -1115,7 +1112,6 @@ static int ibmveth_seq_show(struct seq_file *seq, void *v) 
	seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);



	seq_printf(seq, "Unit Address:    0x%x\n", adapter->vdev->unit_address);

	seq_printf(seq, "LIOBN:           0x%lx\n", adapter->liobn);

	seq_printf(seq, "Current MAC:     %02X:%02X:%02X:%02X:%02X:%02X\n",

		   current_mac[0], current_mac[1], current_mac[2],

		   current_mac[3], current_mac[4], current_mac[5]);

drivers/net/ibmveth.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ struct ibmveth_adapter { 
    struct net_device_stats stats;

    unsigned int mcastFilterSize;

    unsigned long mac_addr;

    unsigned long liobn;

    void * buffer_list_addr;

    void * filter_list_addr;

    dma_addr_t buffer_list_dma;