diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 14:16:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 14:16:19 -0700 |
| commit | 9aec247d3b213f3c29cfba921cf11deb1ed513cd (patch) | |
| tree | 6ce8272654896b4d0e05b1c82b8d7d3292284676 /drivers/net | |
| parent | dce32c781b1c026863a254fe8123dd78c59ad984 (diff) | |
| parent | 3a867b36c3234673e61f883ebc11ad18f80a176f (diff) | |
| download | blackbird-op-linux-9aec247d3b213f3c29cfba921cf11deb1ed513cd.tar.gz blackbird-op-linux-9aec247d3b213f3c29cfba921cf11deb1ed513cd.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index fd62e43a3510..f0a5b772a386 100644 --- a/drivers/net/bonding/bond_main.c +++ b/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 !!! */ |
