diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-10 17:08:26 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-10 17:08:26 -0800 |
| commit | 6174c3496d43b78969d4a989e1aabfbc55acbf15 (patch) | |
| tree | 1229fbe1ecd94ae14f9ff25ac968d028c2bb7d88 /drivers/staging/batman-adv/main.h | |
| parent | 3701befc44eb9b0e5a0e0b7169448658919b9850 (diff) | |
| download | op-kernel-dev-6174c3496d43b78969d4a989e1aabfbc55acbf15.zip op-kernel-dev-6174c3496d43b78969d4a989e1aabfbc55acbf15.tar.gz | |
Revert "staging: batman-adv: Use linux/etherdevice.h address helper functions"
This reverts commit 5712dc7fc812d1bdbc5e634d389bc759d4e7550c.
Turns out the batman maintainers didn't like the implementation of it,
and the original author was going to rework it to meet their approval,
and I applied it without fully realizing all of this.
My fault.
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/main.h')
| -rw-r--r-- | drivers/staging/batman-adv/main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h index 14d567d..5e3f516 100644 --- a/drivers/staging/batman-adv/main.h +++ b/drivers/staging/batman-adv/main.h @@ -109,7 +109,6 @@ #include <linux/mutex.h> /* mutex */ #include <linux/module.h> /* needed by all modules */ #include <linux/netdevice.h> /* netdevice */ -#include <linux/etherdevice.h> #include <linux/if_ether.h> /* ethernet header */ #include <linux/poll.h> /* poll_table */ #include <linux/kthread.h> /* kernel threads */ @@ -139,6 +138,8 @@ void dec_module_count(void); int compare_orig(void *data1, void *data2); int choose_orig(void *data, int32_t size); int is_my_mac(uint8_t *addr); +int is_bcast(uint8_t *addr); +int is_mcast(uint8_t *addr); #ifdef CONFIG_BATMAN_ADV_DEBUG int debug_log(struct bat_priv *bat_priv, char *fmt, ...); |
