git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
da55c03
)
Make the branch compile with fixing following error:
author
S.Çağlar Onur
<caglar@cs.princeton.edu>
Tue, 22 Dec 2009 21:39:59 +0000
(21:39 +0000)
committer
S.Çağlar Onur
<caglar@cs.princeton.edu>
Tue, 22 Dec 2009 21:39:59 +0000
(21:39 +0000)
drivers/net/bonding/bond_main.c:3533: error: incompatible type for argument 2 of 'atomic_add_return'
linux-2.6-722-bonding-rr.patch
patch
|
blob
|
history
diff --git
a/linux-2.6-722-bonding-rr.patch
b/linux-2.6-722-bonding-rr.patch
index
8b363da
..
0bddd68
100644
(file)
--- 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 ----------------------------*/