From df6896bd1c6cbf7a33635c777c304cafe81b884f Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 4 Oct 2005 22:39:41 -0700 Subject: [PATCH] --- yaml --- r: 9661 b: refs/heads/master c: de54f3907d2f5d8e25cfafe513811f146b250dee h: refs/heads/master i: 9659: b1aba35c6aa60ec8bd4fa6e99fdf3595e1944f27 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6294fcb322d9..af5ec8691174 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b5b3f3d826ea87c224c66de9c95c09e7f110ecd +refs/heads/master: de54f3907d2f5d8e25cfafe513811f146b250dee diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index fd62e43a3510..f0a5b772a386 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -1289,12 +1289,13 @@ static void bond_mc_list_destroy(struct bonding *bond) /* * Copy all the Multicast addresses from src to the bonding device dst */ -static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond, int gpf_flag) +static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond, + unsigned int __nocast gfp_flag) { struct dev_mc_list *dmi, *new_dmi; for (dmi = mc_list; dmi; dmi = dmi->next) { - new_dmi = kmalloc(sizeof(struct dev_mc_list), gpf_flag); + new_dmi = kmalloc(sizeof(struct dev_mc_list), gfp_flag); if (!new_dmi) { /* FIXME: Potential memory leak !!! */