From 1633782403fc731154ad3a5afd85f53f6a2d4df2 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Wed, 16 Apr 2008 21:01:09 -0700 Subject: [PATCH] --- yaml --- r: 88475 b: refs/heads/master c: 9d84ab9c7e82e7b6b9f8c25794f64f65d021c8fd h: refs/heads/master i: 88473: 27b9b7113824fbd414010b3e503dd646f0fd84cd 88471: 92c8485c1a5e89c440adbf3b8663290719d06eb1 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes.h | 1 - trunk/drivers/infiniband/hw/nes/nes_nic.c | 22 ---------------------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/[refs] b/[refs] index 11ae776ee515..d1d89bc00781 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bd8341ce2bb5ef575b3501a8c13f22ae9f0b2ad +refs/heads/master: 9d84ab9c7e82e7b6b9f8c25794f64f65d021c8fd diff --git a/trunk/drivers/infiniband/hw/nes/nes.h b/trunk/drivers/infiniband/hw/nes/nes.h index 5498b747233c..3f5a04d2e62d 100644 --- a/trunk/drivers/infiniband/hw/nes/nes.h +++ b/trunk/drivers/infiniband/hw/nes/nes.h @@ -524,7 +524,6 @@ int nes_nic_cm_xmit(struct sk_buff *, struct net_device *); /* nes_nic.c */ void nes_netdev_set_multicast_list(struct net_device *); -void nes_netdev_exit(struct nes_vnic *); struct net_device *nes_netdev_init(struct nes_device *, void __iomem *); void nes_netdev_destroy(struct net_device *); int nes_nic_cm_xmit(struct sk_buff *, struct net_device *); diff --git a/trunk/drivers/infiniband/hw/nes/nes_nic.c b/trunk/drivers/infiniband/hw/nes/nes_nic.c index eee77da61935..9bdfdcc92fff 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_nic.c +++ b/trunk/drivers/infiniband/hw/nes/nes_nic.c @@ -947,28 +947,6 @@ static int nes_netdev_change_mtu(struct net_device *netdev, int new_mtu) return ret; } - -/** - * nes_netdev_exit - destroy network device - */ -void nes_netdev_exit(struct nes_vnic *nesvnic) -{ - struct net_device *netdev = nesvnic->netdev; - struct nes_ib_device *nesibdev = nesvnic->nesibdev; - - nes_debug(NES_DBG_SHUTDOWN, "\n"); - - // destroy the ibdevice if RDMA enabled - if ((nesvnic->rdma_enabled)&&(nesvnic->of_device_registered)) { - nes_destroy_ofa_device( nesibdev ); - nesvnic->of_device_registered = 0; - nesvnic->nesibdev = NULL; - } - unregister_netdev(netdev); - nes_debug(NES_DBG_SHUTDOWN, "\n"); -} - - #define NES_ETHTOOL_STAT_COUNT 55 static const char nes_ethtool_stringset[NES_ETHTOOL_STAT_COUNT][ETH_GSTRING_LEN] = { "Link Change Interrupts",