aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Leon <santil@us.ibm.com>2006-10-03 13:24:39 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-05 06:43:23 -0400
commit03a85d0907b2455c772b8fb179b0c07a66b00ddb (patch)
tree7fdd36057604315737d6c14e590eec6ceb6be687
parent4347ef15f76dca33ae8da769d6900a468253bda2 (diff)
[PATCH] ibmveth: rename proc entry name
This patch changes the name of the proc file for each ibmveth adapter from the network device name to the slot number in the virtual bus. The proc file is created when the device is probed, so a change in the name of the device will not be reflected in the name of the proc file giving problems when identifying and removing the adapter. The slot number is a property that does not change through the life of the adapter so we use that instead. Signed-off-by: Santiago Leon <santil@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/ibmveth.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 2ec49d254530..6aff2bc3df55 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1165,7 +1165,9 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
1165{ 1165{
1166 struct proc_dir_entry *entry; 1166 struct proc_dir_entry *entry;
1167 if (ibmveth_proc_dir) { 1167 if (ibmveth_proc_dir) {
1168 entry = create_proc_entry(adapter->netdev->name, S_IFREG, ibmveth_proc_dir); 1168 char u_addr[10];
1169 sprintf(u_addr, "%x", adapter->vdev->unit_address);
1170 entry = create_proc_entry(u_addr, S_IFREG, ibmveth_proc_dir);
1169 if (!entry) { 1171 if (!entry) {
1170 ibmveth_error_printk("Cannot create adapter proc entry"); 1172 ibmveth_error_printk("Cannot create adapter proc entry");
1171 } else { 1173 } else {
@@ -1180,7 +1182,9 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
1180static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter) 1182static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter)
1181{ 1183{
1182 if (ibmveth_proc_dir) { 1184 if (ibmveth_proc_dir) {
1183 remove_proc_entry(adapter->netdev->name, ibmveth_proc_dir); 1185 char u_addr[10];
1186 sprintf(u_addr, "%x", adapter->vdev->unit_address);
1187 remove_proc_entry(u_addr, ibmveth_proc_dir);
1184 } 1188 }
1185} 1189}
1186 1190