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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
drivers
/
net
/
bonding
/
bonding.h
diff --git
a/drivers/net/bonding/bonding.h
b/drivers/net/bonding/bonding.h
index
f989e15
..
c990b42
100644
(file)
--- a/
drivers/net/bonding/bonding.h
+++ b/
drivers/net/bonding/bonding.h
@@
-231,7
+231,6
@@
struct bonding {
char proc_file_name[IFNAMSIZ];
#endif /* CONFIG_PROC_FS */
struct list_head bond_list;
- struct netdev_hw_addr_list mc_list;
int (*xmit_hash_policy)(struct sk_buff *, int);
u16 rr_tx_counter;
struct ad_bond_info ad_info;