Re: mac80211 truesize bugs

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <johannes@...>
Cc: <herbert@...>, <mb@...>, <netdev@...>, <linux-wireless@...>
Date: Monday, May 12, 2008 - 11:17 pm

From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 03 May 2008 16:25:20 +0200

[ Ok, I'm going through all of this, we'll solve the problems one at
  a time and get this all taken care of.  ]

 ...

Thanks for these numbers.

Based upon them I will adjust LL_MAX_HEADER as follows:

net: Set LL_MAX_HEADER properly for wireless.

Wireless networking, particularly with MESH enabled, has
quite strong requirements for link-layer header space.

Based upon some numbers and descriptions from Johannes Berg
we use 96 (same as AX25) for plain wireless, and with
mesh enabled we use 128.

In the process, simplify the cpp conditional logic here by
ordering the cases by those needing the most space down
to those needing the least case.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/linux/netdevice.h |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 7469017..a3fb57f 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -93,14 +93,16 @@ struct wireless_dev;
  *	used.
  */
  
-#if !defined(CONFIG_AX25) && !defined(CONFIG_AX25_MODULE) && !defined(CONFIG_TR)
-#define LL_MAX_HEADER	32
+#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+# if defined(CONFIG_MAC80211_MESH)
+#  define LL_MAX_HEADER 128
+# else
+#  define LL_MAX_HEADER 96
+# endif
+#elif defined(CONFIG_TR)
+# define LL_MAX_HEADER 48
 #else
-#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-#define LL_MAX_HEADER	96
-#else
-#define LL_MAX_HEADER	48
-#endif
+# define LL_MAX_HEADER 32
 #endif
 
 #if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \
-- 
1.5.5.1.57.g5909c

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
mac80211 truesize bugs, Johannes Berg, (Wed Apr 30, 10:02 pm)
frame status API? (was: mac80211 truesize bugs), Johannes Berg, (Sat May 3, 9:55 pm)
Re: mac80211 truesize bugs, Michael Buesch, (Thu May 1, 4:58 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 5:08 am)
Re: mac80211 truesize bugs, Michael Buesch, (Thu May 1, 5:32 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 5:34 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 5:20 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 5:32 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 5:43 am)
Re: mac80211 truesize bugs, Herbert Xu, (Thu May 1, 6:36 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 6:49 am)
Re: mac80211 truesize bugs, Herbert Xu, (Thu May 1, 7:02 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 6:53 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 6:58 am)
Re: mac80211 truesize bugs, Herbert Xu, (Thu May 1, 7:03 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 8:38 am)
Re: mac80211 truesize bugs, Herbert Xu, (Sat May 3, 8:59 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 12:03 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 6:56 pm)
Re: mac80211 truesize bugs, David Miller, (Sat May 3, 7:07 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 7:15 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Fri May 2, 4:38 pm)
Re: mac80211 truesize bugs, David Miller, (Fri May 2, 7:33 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 7:52 am)
Re: mac80211 truesize bugs, David Miller, (Sat May 3, 9:03 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 9:42 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 10:09 pm)
Re: mac80211 truesize bugs, Herbert Xu, (Sat May 3, 10:02 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 10:08 pm)
Re: mac80211 truesize bugs, Herbert Xu, (Sat May 3, 10:12 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 10:22 pm)
Re: mac80211 truesize bugs, Herbert Xu, (Sat May 3, 11:16 pm)
Re: mac80211 truesize bugs, David Miller, (Sun May 4, 6:38 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 4:47 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 5:14 am)
Re: mac80211 truesize bugs, Herbert Xu, (Sun May 4, 5:44 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 5:52 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 7:25 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 8:28 am)
Re: mac80211 truesize bugs, Herbert Xu, (Sun May 4, 8:45 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 10:06 am)
Re: mac80211 truesize bugs, David Miller, (Sun May 4, 6:45 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 6:48 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 12:03 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 1:47 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 8:52 am)
Re: mac80211 truesize bugs, Herbert Xu, (Sun May 4, 8:56 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 9:00 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 8:48 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 5:37 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 10:25 am)
Re: mac80211 truesize bugs, David Miller, (Mon May 12, 11:17 pm)
Re: mac80211 truesize bugs, John W. Linville, (Tue May 13, 4:39 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Tue May 13, 4:59 pm)
Re: mac80211 truesize bugs, Tomas Winkler, (Tue May 13, 5:12 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Tue May 13, 5:37 pm)
Re: mac80211 truesize bugs, David Miller, (Tue May 13, 6:09 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 8:05 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 7:49 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 7:38 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 7:24 pm)
Re: mac80211 truesize bugs, David Miller, (Sat May 3, 7:32 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 7:43 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 5:48 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 5:56 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 6:08 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 6:32 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 6:45 am)