From: stsp Date: Mon, 17 May 2021 11:44:22 +0000 (+0000) Subject: put unused 802.11 fragmentation support code under #ifdef notyet X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4d38a6784bd5f89744818c196af718035f41491d;p=openbsd put unused 802.11 fragmentation support code under #ifdef notyet --- diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 1197112c055..41e8bd6cca1 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_input.c,v 1.235 2021/05/17 08:02:20 stsp Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.236 2021/05/17 11:44:22 stsp Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe @@ -703,6 +703,7 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni, if_input(ifp, &ml); } +#ifdef notyet /* * Handle defragmentation (see 9.5 and Annex C). We support the concurrent * reception of fragments of three fragmented MSDUs or MMPDUs. @@ -792,6 +793,7 @@ ieee80211_defrag_timeout(void *arg) splx(s); } +#endif /* * Process a received data MPDU related to a specific HT-immediate Block Ack diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 06cf7375f70..334439887ff 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_var.h,v 1.103 2021/04/29 21:43:47 stsp Exp $ */ +/* $OpenBSD: ieee80211_var.h,v 1.104 2021/05/17 11:44:22 stsp Exp $ */ /* $NetBSD: ieee80211_var.h,v 1.7 2004/05/06 03:07:10 dyoung Exp $ */ /*- @@ -332,8 +332,10 @@ struct ieee80211com { enum ieee80211_cipher ic_rsngroupcipher; enum ieee80211_cipher ic_rsngroupmgmtcipher; +#ifdef notyet struct ieee80211_defrag ic_defrag[IEEE80211_DEFRAG_SIZE]; int ic_defrag_cur; +#endif u_int8_t *ic_tim_bitmap; u_int ic_tim_len;