Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / fs / afs / cmservice.c

diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index 602d75bf9bb2a47d8f93ece32ca92fcbf676399f..4f1b6f466ff510d2899ae6f225ff5e0234875f15 100644 (file)
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -583,9 +583,8 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call)
  */
 static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work)
 {
-       struct afs_interface *ifs;
        struct afs_call *call = container_of(work, struct afs_call, work);
-       int loop, nifs;
+       int loop;
 
        struct {
                struct /* InterfaceAddr */ {
@@ -603,19 +602,7 @@ static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work)
 
        _enter("");
 
-       nifs = 0;
-       ifs = kcalloc(32, sizeof(*ifs), GFP_KERNEL);
-       if (ifs) {
-               nifs = afs_get_ipv4_interfaces(call->net, ifs, 32, false);
-               if (nifs < 0) {
-                       kfree(ifs);
-                       ifs = NULL;
-                       nifs = 0;
-               }
-       }
-
        memset(&reply, 0, sizeof(reply));
-       reply.ia.nifs = htonl(nifs);
 
        reply.ia.uuid[0] = call->net->uuid.time_low;
        reply.ia.uuid[1] = htonl(ntohs(call->net->uuid.time_mid));
@@ -625,15 +612,6 @@ static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work)
        for (loop = 0; loop < 6; loop++)
                reply.ia.uuid[loop + 5] = htonl((s8) call->net->uuid.node[loop]);
 
-       if (ifs) {
-               for (loop = 0; loop < nifs; loop++) {
-                       reply.ia.ifaddr[loop] = ifs[loop].address.s_addr;
-                       reply.ia.netmask[loop] = ifs[loop].netmask.s_addr;
-                       reply.ia.mtu[loop] = htonl(ifs[loop].mtu);
-               }
-               kfree(ifs);
-       }
-
        reply.cap.capcount = htonl(1);
        reply.cap.caps[0] = htonl(AFS_CAP_ERROR_TRANSLATION);
        afs_send_simple_reply(call, &reply, sizeof(reply));