| ieee80211_input.c (283535) | ieee80211_input.c (283538) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 283535 2015-05-25 16:37:41Z adrian $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 283538 2015-05-25 19:18:16Z adrian $"); |
| 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/endian.h> --- 407 unchanged lines hidden (view full) --- 444 if (istmp) 445 ieee80211_free_node(ni); 446} 447 448int 449ieee80211_alloc_challenge(struct ieee80211_node *ni) 450{ 451 if (ni->ni_challenge == NULL) | 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/endian.h> --- 407 unchanged lines hidden (view full) --- 444 if (istmp) 445 ieee80211_free_node(ni); 446} 447 448int 449ieee80211_alloc_challenge(struct ieee80211_node *ni) 450{ 451 if (ni->ni_challenge == NULL) |
| 452 ni->ni_challenge = (uint32_t *) malloc(IEEE80211_CHALLENGE_LEN, 453 M_80211_NODE, M_NOWAIT); | 452 ni->ni_challenge = (uint32_t *) 453 IEEE80211_MALLOC(IEEE80211_CHALLENGE_LEN, 454 M_80211_NODE, IEEE80211_M_NOWAIT); |
| 454 if (ni->ni_challenge == NULL) { 455 IEEE80211_NOTE(ni->ni_vap, 456 IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, 457 "%s", "shared key challenge alloc failed"); 458 /* XXX statistic */ 459 } 460 return (ni->ni_challenge != NULL); 461} --- 498 unchanged lines hidden --- | 455 if (ni->ni_challenge == NULL) { 456 IEEE80211_NOTE(ni->ni_vap, 457 IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, 458 "%s", "shared key challenge alloc failed"); 459 /* XXX statistic */ 460 } 461 return (ni->ni_challenge != NULL); 462} --- 498 unchanged lines hidden --- |