libnetlink: remove unused junk callback

[lisovros/iproute2_canprio.git] / ip / iplink.c

diff --git a/ip/iplink.c b/ip/iplink.c
index 48c025480a786ba5d5d07168521930eac717fe45..6b051b65faab72ea46534ad33f71b3f6cd35c11b 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -43,7 +43,7 @@ static int iplink_have_newlink(void);
 void iplink_usage(void)
 {
        if (iplink_have_newlink()) {
-               fprintf(stderr, "Usage: ip link add link DEV [ name ] NAME\n");
+               fprintf(stderr, "Usage: ip link add [link DEV] [ name ] NAME\n");
                fprintf(stderr, "                   [ txqueuelen PACKETS ]\n");
                fprintf(stderr, "                   [ address LLADDR ]\n");
                fprintf(stderr, "                   [ broadcast LLADDR ]\n");
@@ -67,17 +67,21 @@ void iplink_usage(void)
        fprintf(stderr, "                         [ broadcast LLADDR ]\n");
        fprintf(stderr, "                         [ mtu MTU ]\n");
        fprintf(stderr, "                         [ netns PID ]\n");
+       fprintf(stderr, "                         [ netns NAME ]\n");
        fprintf(stderr, "                         [ alias NAME ]\n");
        fprintf(stderr, "                         [ vf NUM [ mac LLADDR ]\n");
        fprintf(stderr, "                                  [ vlan VLANID [ qos VLAN-QOS ] ]\n");
+
        fprintf(stderr, "                                  [ rate TXRATE ] ] \n");
+
+       fprintf(stderr, "                                  [ spoofchk { on | off} ] ] \n");
        fprintf(stderr, "                         [ master DEVICE ]\n");
        fprintf(stderr, "                         [ nomaster ]\n");
        fprintf(stderr, "       ip link show [ DEVICE | group GROUP ]\n");
 
        if (iplink_have_newlink()) {
                fprintf(stderr, "\n");
-               fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can }\n");
+               fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can | bridge }\n");
        }
        exit(-1);
 }
@@ -160,7 +164,7 @@ static int iplink_have_newlink(void)
                req.n.nlmsg_type = RTM_NEWLINK;
                req.i.ifi_family = AF_UNSPEC;
 
-               rtnl_send(&rth, (char *)&req.n, req.n.nlmsg_len);
+               rtnl_send(&rth, &req.n, req.n.nlmsg_len);
                rtnl_listen(&rth, accept_msg, NULL);
        }
        return have_rtnl_newlink;
@@ -227,6 +231,18 @@ int iplink_parse_vf(int vf, int *argcp, char ***argvp,
                        ivt.vf = vf;
                        addattr_l(&req->n, sizeof(*req), IFLA_VF_TX_RATE, &ivt, sizeof(ivt));
                
+               } else if (matches(*argv, "spoofchk") == 0) {
+                       struct ifla_vf_spoofchk ivs;
+                       NEXT_ARG();
+                       if (matches(*argv, "on") == 0)
+                               ivs.setting = 1;
+                       else if (matches(*argv, "off") == 0)
+                               ivs.setting = 0;
+                       else
+                               invarg("Invalid \"spoofchk\" value\n", *argv);
+                       ivs.vf = vf;
+                       addattr_l(&req->n, sizeof(*req), IFLA_VF_SPOOFCHK, &ivs, sizeof(ivs));
+
                } else {
                        /* rewind arg */
                        PREV_ARG();
@@ -304,9 +320,12 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
                         NEXT_ARG();
                         if (netns != -1)
                                 duparg("netns", *argv);
-                        if (get_integer(&netns, *argv, 0))
+                       if ((netns = get_netns_fd(*argv)) >= 0)
+                               addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD, &netns, 4);
+                       else if (get_integer(&netns, *argv, 0) == 0)
+                               addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4);
+                       else
                                 invarg("Invalid \"netns\" value\n", *argv);
-                        addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4);
                } else if (strcmp(*argv, "multicast") == 0) {
                        NEXT_ARG();
                        req->i.ifi_change |= IFF_MULTICAST;
@@ -463,7 +482,7 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
 
                        req.i.ifi_index = 0;
                        addattr32(&req.n, sizeof(req), IFLA_GROUP, group);
-                       if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+                       if (rtnl_talk(&rth, &req.n, 0, 0, NULL) < 0)
                                exit(2);
                        return 0;
                }
@@ -540,7 +559,7 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
                addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name, len);
        }
 
-       if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+       if (rtnl_talk(&rth, &req.n, 0, 0, NULL) < 0)
                exit(2);
 
        return 0;