diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-28 04:10:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-28 04:10:26 -0700 |
| commit | 82aee5d7c01fd1a398e938e496e6cb8841775f91 (patch) | |
| tree | 505bab77000197cb33b32ccea7bc8c7c252eb9a4 /net/batman-adv/unicast.h | |
| parent | 41347dcdd81988b8e60853257b2875285cc17a4e (diff) | |
| parent | 42d0b044b7c9e5821f1bf3e2b4ea7861417c11c2 (diff) | |
| download | blackbird-op-linux-82aee5d7c01fd1a398e938e496e6cb8841775f91.tar.gz blackbird-op-linux-82aee5d7c01fd1a398e938e496e6cb8841775f91.zip | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- another batch of patches meant to clean batman-adv namespace
- deletion of an obsolete intermediate buffer used in the visualization code to
print the output
- TT code cleanups
Diffstat (limited to 'net/batman-adv/unicast.h')
| -rw-r--r-- | net/batman-adv/unicast.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h index 9257b83534fd..936287f552ee 100644 --- a/net/batman-adv/unicast.h +++ b/net/batman-adv/unicast.h @@ -22,8 +22,8 @@ #include "packet.h" -#define FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */ -#define FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */ +#define BATADV_FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */ +#define BATADV_FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */ int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv, struct sk_buff **new_skb); |
