diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-24 15:18:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-24 15:18:07 -0400 |
| commit | 85c21049fc588e0a51b443fe2bad348d18f4992c (patch) | |
| tree | 66d800593c25b6be792969152e2dd1fb64581206 /net/mac80211/mesh_hwmp.c | |
| parent | 2c33bb37cb69dc6d86d2ee8edd1d4814990a65fe (diff) | |
| parent | f20b6213f193f455a62ef9299ceca11f5531dff8 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
This is a batch of updates intended for 3.7. The bulk of it is
mac80211 changes, including some mesh work from Thomas Pederson and
some multi-channel work from Johannes. A variety of driver updates
and other bits are scattered in there as well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mesh_hwmp.c')
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 494bc39f61a4..47aeee2d8db1 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | #define MAX_METRIC 0xffffffff | 17 | #define MAX_METRIC 0xffffffff |
| 18 | #define ARITH_SHIFT 8 | 18 | #define ARITH_SHIFT 8 |
| 19 | 19 | ||
| 20 | /* Number of frames buffered per destination for unresolved destinations */ | ||
| 21 | #define MESH_FRAME_QUEUE_LEN 10 | ||
| 22 | #define MAX_PREQ_QUEUE_LEN 64 | 20 | #define MAX_PREQ_QUEUE_LEN 64 |
| 23 | 21 | ||
| 24 | /* Destination only */ | 22 | /* Destination only */ |