Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net80211 Set max_linkhdr when attaching so when bridging...



details:   https://anonhg.NetBSD.org/src/rev/d80a91829305
branches:  trunk
changeset: 782694:d80a91829305
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Nov 14 18:34:05 2012 +0000

description:
Set max_linkhdr when attaching so when bridging/forwarding ethernet drivers
have a chance to reserve enough space to insert a max-sized 802.11 header.

diffstat:

 sys/net80211/ieee80211_netbsd.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r da1f80ddc20f -r d80a91829305 sys/net80211/ieee80211_netbsd.c
--- a/sys/net80211/ieee80211_netbsd.c   Wed Nov 14 17:15:25 2012 +0000
+++ b/sys/net80211/ieee80211_netbsd.c   Wed Nov 14 18:34:05 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.21 2012/06/02 21:36:47 dsl Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.22 2012/11/14 18:34:05 matt Exp $ */
 /*-
  * Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
  * All rights reserved.
@@ -30,7 +30,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.8 2005/08/08 18:46:35 sam Exp $");
 #else
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.21 2012/06/02 21:36:47 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.22 2012/11/14 18:34:05 matt Exp $");
 #endif
 
 /*
@@ -81,6 +81,10 @@
 {
        ieee80211_setup_func * const *ieee80211_setup, f;
 
+       if (max_linkhdr < ALIGN(sizeof(struct ieee80211_qosframe_addr4))) {
+               max_linkhdr = ALIGN(sizeof(struct ieee80211_qosframe_addr4));
+       }
+
         __link_set_foreach(ieee80211_setup, ieee80211_funcs) {
                f = (void*)*ieee80211_setup;
                (*f)();



Home | Main Index | Thread Index | Old Index