powerpc: Remove ibmveth "liobn" field
PATCH 1/1 powerpc: 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 Benjamin Herrenschmidt <[email protected]>
---
This will avoid this driver from breaking when I change the dma mapping code for 2.6.20.
drivers/net/ibmveth.c +0 -4
@@ -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(struc 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_fseq_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
@@ -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;
Quoted 2 lines · Benjamin Herrenschmidt
Remove the now unused "liobn" field in ibmveth which also avoids having insider knowledge of the iommu table in that driver.
Thanks for cleaning that up.
Quoted 2 lines
Signed-off-by Benjamin Herrenschmidt <[email protected]>
Signed-off-by Santiago Leon <[email protected]>
---
Quoted 13 lines
This will avoid this driver from breaking when I change the dma mapping code for 2.6.20.
Index:
linux-cell/drivers/net/ibmveth.c
===================================================================drivers/net/ibmveth.c +0
-1@@ -50,7 +50,6 @@#include <asm/semaphore.h> #include <asm/hvcall.h> #include <asm/atomic.h> -#include <asm/iommu.h>
...
Signature · 3 lines
Santiago A. Leon Power Linux Development IBM Linux Technology Center