git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
drivers
/
net
/
bonding
/
bonding.h
diff --git
a/drivers/net/bonding/bonding.h
b/drivers/net/bonding/bonding.h
index
82fec5f
..
1aecc37
100644
(file)
--- a/
drivers/net/bonding/bonding.h
+++ b/
drivers/net/bonding/bonding.h
@@
-222,7
+222,6
@@
struct bonding {
struct slave *);
rwlock_t lock;
rwlock_t curr_slave_lock;
- s8 kill_timers;
u8 send_peer_notif;
s8 setup_by_slave;
s8 igmp_retrans;