int jt_ptl_network(int argc, char **argv)
{
struct libcfs_ioctl_data data;
- __u32 net = LNET_NIDNET(LNET_NID_ANY);
+ __u32 net = LNET_NET_ANY;
int rc;
if (argc != 2) {
}
net = libcfs_str2net(argv[1]);
- if (net == LNET_NIDNET(LNET_NID_ANY)) {
+ if (net == LNET_NET_ANY) {
fprintf(stderr, "Can't parse net %s\n", argv[1]);
return -1;
}
}
LIBCFS_IOC_INIT_V2(data, cfg_hdr);
- data.cfg_net = g_net_set ? g_net : LNET_NIDNET(LNET_NID_ANY);
+ data.cfg_net = g_net_set ? g_net : LNET_NET_ANY;
data.cfg_nid = nid;
rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_ROUTE, &data);
net = data.cfg_net;
hops = data.cfg_config_u.cfg_route.rtr_hop;
nid = data.cfg_nid;
- alive = data.cfg_config_u.cfg_route.rtr_flags;
+ alive = data.cfg_config_u.cfg_route.rtr_flags & LNET_RT_ALIVE;
pri = data.cfg_config_u.cfg_route.rtr_priority;
printf("net %18s hops %u gw %32s %s pri %u\n",
/* NB: can't support range ipaddress except * and *@net */
if (strlen(str) > 2 && str[0] == '*' && str[1] == '@') {
net = libcfs_str2net(str + 2);
- if (net == LNET_NIDNET(LNET_NID_ANY))
+ if (net == LNET_NET_ANY)
goto failed;
nid = LNET_MKNID(net, LNET_NIDADDR(LNET_NID_ANY));
optstr = opc == LNET_CTL_DROP_ADD ? "s:d:o:r:i:p:m:e:nx" : "s:d:o:r:l:p:m:";
memset(&attr, 0, sizeof(attr));
while (1) {
- char c = getopt_long(argc, argv, optstr, opts, NULL);
+ int c = getopt_long(argc, argv, optstr, opts, NULL);
if (c == -1)
break;
memset(&attr, 0, sizeof(attr));
while (1) {
- char c = getopt_long(argc, argv, "s:d:a", opts, NULL);
+ int c = getopt_long(argc, argv, "s:d:a", opts, NULL);
if (c == -1 || all)
break;