From 88d8bae287c48096d3c33ac5774383d68a5a39aa Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 5 Jan 2010 18:07:33 -0800 Subject: [PATCH] Remove duplicate __dev_addr_sync() and __dev_addr_sync() for older kernels These were implemented eons ago for 2.6.25 backport work but now 2.6.32 exported these again implemented in the exact same way so just use that. 2.6.24 now compiles with ath9k. Signed-off-by: Luis R. Rodriguez --- compat/compat-2.6.25.c | 48 ------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/compat/compat-2.6.25.c b/compat/compat-2.6.25.c index bd2afefa7d00..19ecdd28cc3d 100644 --- a/compat/compat-2.6.25.c +++ b/compat/compat-2.6.25.c @@ -328,53 +328,5 @@ define_strict_strtox(l, long) EXPORT_SYMBOL(strict_strtoul); EXPORT_SYMBOL(strict_strtol); -int __dev_addr_sync(struct dev_addr_list **to, int *to_count, - struct dev_addr_list **from, int *from_count) -{ - struct dev_addr_list *da, *next; - int err = 0; - - da = *from; - while (da != NULL) { - next = da->next; - if (!da->da_synced) { - err = __dev_addr_add(to, to_count, - da->da_addr, da->da_addrlen, 0); - if (err < 0) - break; - da->da_synced = 1; - da->da_users++; - } else if (da->da_users == 1) { - __dev_addr_delete(to, to_count, - da->da_addr, da->da_addrlen, 0); - __dev_addr_delete(from, from_count, - da->da_addr, da->da_addrlen, 0); - } - da = next; - } - return err; -} -EXPORT_SYMBOL_GPL(__dev_addr_sync); - -void __dev_addr_unsync(struct dev_addr_list **to, int *to_count, - struct dev_addr_list **from, int *from_count) -{ - struct dev_addr_list *da, *next; - - da = *from; - while (da != NULL) { - next = da->next; - if (da->da_synced) { - __dev_addr_delete(to, to_count, - da->da_addr, da->da_addrlen, 0); - da->da_synced = 0; - __dev_addr_delete(from, from_count, - da->da_addr, da->da_addrlen, 0); - } - da = next; - } -} -EXPORT_SYMBOL_GPL(__dev_addr_unsync); - #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) */ -- 2.30.2