LU-9679 general: avoid bare return; at end of void function

[fs/lustre-release.git] / lnet / klnds / gnilnd / gnilnd_aries.h

diff --git a/lnet/klnds/gnilnd/gnilnd_aries.h b/lnet/klnds/gnilnd/gnilnd_aries.h
index b36603e..431442f 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_aries.h
+++ b/lnet/klnds/gnilnd/gnilnd_aries.h
@@ -24,7 +24,6 @@
 #ifndef _GNILND_ARIES_H
 #define _GNILND_ARIES_H
 
-/* for lnet_ipif_query */
 #include <lnet/lib-lnet.h>
 
 #ifndef _GNILND_HSS_OPS_H
@@ -90,150 +89,4 @@ kgnilnd_deregister_smdd_buf(kgn_device_t *dev)
        return rc;
 }
 
-/* plug in our functions for use on the simulator */
-#if !defined(GNILND_USE_RCA)
-
-extern kgn_data_t kgnilnd_data;
-
-#define kgnilnd_hw_hb()              do {} while(0)
-
-#ifdef CONFIG_CRAY_XT
-
-/* Aries Sim doesn't have hardcoded tables, so we'll hijack the nic_pe
- * and decode our address and nic addr from that - the rest are just offsets */
-
-static inline int
-kgnilnd_nid_to_nicaddrs(__u32 nid, int numnic, __u32 *nicaddr)
-{
-       if (numnic > 1) {
-               CERROR("manual nid2nic translation doesn't support"
-                      "multiple nic addrs (you asked for %d)\n",
-                       numnic);
-               return -EINVAL;
-       }
-       if (nid < kgnilnd_data.kgn_nid_trans_private) {
-               CERROR("Request for invalid nid translation %u,"
-                      "minimum %llu\n",
-                      nid, kgnilnd_data.kgn_nid_trans_private);
-               return -ESRCH;
-       }
-
-       *nicaddr = nid - kgnilnd_data.kgn_nid_trans_private;
-
-       CDEBUG(D_NETTRACE, "Sim nid %d -> nic 0x%x\n", nid, *nicaddr);
-
-       return 1;
-}
-
-static inline int
-kgnilnd_nicaddr_to_nid(__u32 nicaddr, __u32 *nid)
-{
-       *nid = kgnilnd_data.kgn_nid_trans_private + nicaddr;
-       return 1;
-}
-
-/* XXX Nic: This does not support multiple device!!!! */
-static inline int
-kgnilnd_setup_nic_translation(__u32 device_id)
-{
-       char              *if_name = "ipogif0";
-       __u32              ipaddr, netmask, my_nid;
-       int                up, rc;
-
-       LCONSOLE_INFO("using Aries SIM IP info for RCA translation\n");
-
-       rc = lnet_ipif_query(if_name, &up, &ipaddr, &netmask);
-       if (rc != 0) {
-               CERROR ("can't get IP interface for %s: %d\n", if_name, rc);
-               return rc;
-       }
-       if (!up) {
-               CERROR ("IP interface %s is down\n", if_name);
-               return -ENODEV;
-       }
-
-       my_nid = ((ipaddr >> 8) & 0xFF) + (ipaddr & 0xFF);
-       kgnilnd_data.kgn_nid_trans_private = my_nid - device_id;
-
-       return 0;
-}
-
-#else /* CONFIG_CRAY_XT */
-#include <net/inet_common.h>
-#include <linux/if_arp.h>
-
-static inline int
-kgnilnd_nid_to_nicaddrs(__u32 nid, int numnic, __u32 *nicaddrs)
-{
-       int rc;
-
-#define NID_MASK ((1ULL << 18) - 1)
-       mm_segment_t fs;
-       struct arpreq req = {
-               .arp_dev = "ipogif0",
-       };
-
-       req.arp_pa.sa_family = AF_INET;
-       ((struct sockaddr_in *)&req.arp_pa)->sin_addr.s_addr = htonl(nid);
-
-       fs = get_fs();
-       set_fs(get_ds());
-
-       rc = inet_ioctl(kgnilnd_data.kgn_sock, SIOCGARP, (unsigned long)&req);
-       set_fs(fs);
-
-       if (rc < 0) {
-               CDEBUG(D_NETERROR, "inet_ioctl returned %d\n", rc);
-               return 0;
-       }
-
-       /* use the lower 18 bits of the mac address to use as a nid value */
-       *nicaddrs = *(__u32 *)&req.arp_ha.sa_data[2];
-       *nicaddrs = ntohl(*nicaddrs) & NID_MASK;
-
-       CDEBUG(D_NETTRACE, "nid %s -> nic 0x%x\n", libcfs_nid2str(nid),
-               nicaddrs[0]);
-
-       return 1;
-}
-
-static inline int
-kgnilnd_nicaddr_to_nid(__u32 nicaddr, __u32 *nid)
-{
-       int rc;
-       mm_segment_t fs;
-       struct ifreq ifr = {
-               .ifr_name = "ipogif0",
-       };
-
-       struct sockaddr_in* ipaddr = (struct sockaddr_in*)&ifr.ifr_addr;
-
-       fs = get_fs();
-       set_fs(get_ds());
-       rc = inet_ioctl(kgnilnd_data.kgn_sock, SIOCGIFADDR, (unsigned long)&ifr);
-       set_fs(fs);
-
-       if (rc < 0) {
-               CDEBUG(D_NETERROR, "inet_ioctl returned %d\n", rc);
-               return 1;
-       }
-
-       CDEBUG(D_NETTRACE, "ipaddr %08x\n", htonl(ipaddr->sin_addr.s_addr));
-
-       *nid = htonl(ipaddr->sin_addr.s_addr);
-       CDEBUG(D_NETTRACE, "nic 0x%x -> nid %s\n", nicaddr,
-               libcfs_nid2str(*nid));
-       return 0;
-}
-
-static inline int
-kgnilnd_setup_nic_translation(__u32 device_id)
-{
-       return 0;
-}
-
-#endif /* CONFIG_CRAY_XT */
-
-#endif /* GNILND_USE_RCA */
-
 #endif /* _GNILND_ARIES_H */