[IPV6]: Kill unused warnings in addrconf.c

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index c5b3bd42dcc218c7f42111fdcebf21cb5fa613e6..1a77209096ef2c38553be8e524ea780f8071375d 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2553,80 +2553,6 @@ rtattr_failure:
        return -1;
 }
 
-static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca,
-                               u32 pid, u32 seq, int event)
-{
-       struct ifaddrmsg *ifm;
-       struct nlmsghdr  *nlh;
-       struct ifa_cacheinfo ci;
-       unsigned char    *b = skb->tail;
-
-       nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*ifm));
-       if (pid) nlh->nlmsg_flags |= NLM_F_MULTI;
-       ifm = NLMSG_DATA(nlh);
-       ifm->ifa_family = AF_INET6;     
-       ifm->ifa_prefixlen = 128;
-       ifm->ifa_flags = IFA_F_PERMANENT;
-       ifm->ifa_scope = RT_SCOPE_UNIVERSE;
-       if (ipv6_addr_scope(&ifmca->mca_addr)&IFA_SITE)
-               ifm->ifa_scope = RT_SCOPE_SITE;
-       ifm->ifa_index = ifmca->idev->dev->ifindex;
-       RTA_PUT(skb, IFA_ADDRESS, 16, &ifmca->mca_addr);
-       ci.cstamp = (__u32)(TIME_DELTA(ifmca->mca_cstamp, INITIAL_JIFFIES) / HZ
-                   * 100 + TIME_DELTA(ifmca->mca_cstamp, INITIAL_JIFFIES) % HZ
-                   * 100 / HZ);
-       ci.tstamp = (__u32)(TIME_DELTA(ifmca->mca_tstamp, INITIAL_JIFFIES) / HZ
-                   * 100 + TIME_DELTA(ifmca->mca_tstamp, INITIAL_JIFFIES) % HZ
-                   * 100 / HZ);
-       ci.ifa_prefered = INFINITY_LIFE_TIME;
-       ci.ifa_valid = INFINITY_LIFE_TIME;
-       RTA_PUT(skb, IFA_CACHEINFO, sizeof(ci), &ci);
-       nlh->nlmsg_len = skb->tail - b;
-       return skb->len;
-
-nlmsg_failure:
-rtattr_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-}
-
-static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca,
-                               u32 pid, u32 seq, int event)
-{
-       struct ifaddrmsg *ifm;
-       struct nlmsghdr  *nlh;
-       struct ifa_cacheinfo ci;
-       unsigned char    *b = skb->tail;
-
-       nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*ifm));
-       if (pid) nlh->nlmsg_flags |= NLM_F_MULTI;
-       ifm = NLMSG_DATA(nlh);
-       ifm->ifa_family = AF_INET6;     
-       ifm->ifa_prefixlen = 128;
-       ifm->ifa_flags = IFA_F_PERMANENT;
-       ifm->ifa_scope = RT_SCOPE_UNIVERSE;
-       if (ipv6_addr_scope(&ifaca->aca_addr)&IFA_SITE)
-               ifm->ifa_scope = RT_SCOPE_SITE;
-       ifm->ifa_index = ifaca->aca_idev->dev->ifindex;
-       RTA_PUT(skb, IFA_ADDRESS, 16, &ifaca->aca_addr);
-       ci.cstamp = (__u32)(TIME_DELTA(ifaca->aca_cstamp, INITIAL_JIFFIES) / HZ
-                   * 100 + TIME_DELTA(ifaca->aca_cstamp, INITIAL_JIFFIES) % HZ
-                   * 100 / HZ);
-       ci.tstamp = (__u32)(TIME_DELTA(ifaca->aca_tstamp, INITIAL_JIFFIES) / HZ
-                   * 100 + TIME_DELTA(ifaca->aca_tstamp, INITIAL_JIFFIES) % HZ
-                   * 100 / HZ);
-       ci.ifa_prefered = INFINITY_LIFE_TIME;
-       ci.ifa_valid = INFINITY_LIFE_TIME;
-       RTA_PUT(skb, IFA_CACHEINFO, sizeof(ci), &ci);
-       nlh->nlmsg_len = skb->tail - b;
-       return skb->len;
-
-nlmsg_failure:
-rtattr_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-}
-
 static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
 {
        int idx, ip_idx;
@@ -2635,8 +2561,6 @@ static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
        struct net_device *dev;
        struct inet6_dev *idev = NULL;
        struct inet6_ifaddr *ifa;
-       struct ifmcaddr6 *ifmca;
-       struct ifacaddr6 *ifaca;
        
        s_idx = cb->args[0];
        s_ip_idx = ip_idx = cb->args[1];