diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-17 21:37:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-17 21:37:14 -0700 |
| commit | 5bbc1722d52ad3df062d5742a7e958276e57ebd7 (patch) | |
| tree | 8aa544f9a8623fba2fae933819627ceb839eac1f /include/linux/netdevice.h | |
| parent | 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74 (diff) | |
| parent | ae7b6487ec9c2e2a1551b9d291aa0dbbe0addf48 (diff) | |
| download | linux-5bbc1722d52ad3df062d5742a7e958276e57ebd7.tar.gz linux-5bbc1722d52ad3df062d5742a7e958276e57ebd7.tar.bz2 linux-5bbc1722d52ad3df062d5742a7e958276e57ebd7.zip | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 06d8ea5992df..4bf613cd9e2d 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1479,6 +1479,7 @@ extern void __dev_addr_unsync(struct dev_addr_list **to, int *to_count, struct extern void dev_set_promiscuity(struct net_device *dev, int inc); extern void dev_set_allmulti(struct net_device *dev, int inc); extern void netdev_state_change(struct net_device *dev); +extern void netdev_bonding_change(struct net_device *dev); extern void netdev_features_change(struct net_device *dev); /* Load a device via the kmod */ extern void dev_load(struct net *net, const char *name); @@ -1505,6 +1506,9 @@ extern void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos); extern void dev_seq_stop(struct seq_file *seq, void *v); #endif +extern int netdev_class_create_file(struct class_attribute *class_attr); +extern void netdev_class_remove_file(struct class_attribute *class_attr); + extern void linkwatch_run_queue(void); extern int netdev_compute_features(unsigned long all, unsigned long one); |