From 09714817e117fbbbeb8220c31686936dadd2e1bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Tue, 22 Dec 2009 21:39:59 +0000 Subject: [PATCH] Make the branch compile with fixing following error: drivers/net/bonding/bond_main.c:3533: error: incompatible type for argument 2 of 'atomic_add_return' --- linux-2.6-722-bonding-rr.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-2.6-722-bonding-rr.patch b/linux-2.6-722-bonding-rr.patch index 8b363dace..0bddd685d 100644 --- a/linux-2.6-722-bonding-rr.patch +++ b/linux-2.6-722-bonding-rr.patch @@ -20,7 +20,7 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34.bond2/drivers/net/bonding/bond_main.c linu + struct net_device *bond_dev, int count) +{ + static atomic_t packets; -+ return atomic_inc_return(packets) % count; ++ return atomic_inc_return(&packets) % count; +} + /*-------------------------- Device entry points ----------------------------*/ -- 2.43.0