diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-24 10:33:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-24 10:33:00 -0700 |
| commit | 0e43182c0c9482a26a4108da9254f3e2869a8e18 (patch) | |
| tree | 4631b42bebca8dd9bca61e167e543aabd3b981a7 /net/batman-adv/main.h | |
| parent | 131ea6675c761f655d43b808dd0fe83d15d5cdd3 (diff) | |
| parent | a943cac144e035c21d4f1b31b95f15b33c33a480 (diff) | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/main.h')
| -rw-r--r-- | net/batman-adv/main.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index a6df61a6933b..60b369635b4d 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -44,7 +44,7 @@ #define PURGE_TIMEOUT 200 #define TT_LOCAL_TIMEOUT 3600 /* in seconds */ #define TT_CLIENT_ROAM_TIMEOUT 600 -/* sliding packet range of received originator messages in squence numbers +/* sliding packet range of received originator messages in sequence numbers * (should be a multiple of our word size) */ #define TQ_LOCAL_WINDOW_SIZE 64 #define TT_REQUEST_TIMEOUT 3 /* seconds we have to keep pending tt_req */ @@ -62,6 +62,8 @@ #define NO_FLAGS 0 +#define NULL_IFINDEX 0 /* dummy ifindex used to avoid iface checks */ + #define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE) #define LOG_BUF_LEN 8192 /* has to be a power of 2 */ @@ -133,7 +135,7 @@ enum dbg_level { #include <linux/mutex.h> /* mutex */ #include <linux/module.h> /* needed by all modules */ #include <linux/netdevice.h> /* netdevice */ -#include <linux/etherdevice.h> /* ethernet address classifaction */ +#include <linux/etherdevice.h> /* ethernet address classification */ #include <linux/if_ether.h> /* ethernet header */ #include <linux/poll.h> /* poll_table */ #include <linux/kthread.h> /* kernel threads */ |