Deleted Added
full compact
ieee80211_input.c (184205) ieee80211_input.c (184210)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2008 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-2008 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 184205 2008-10-23 15:53:51Z des $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 184210 2008-10-23 19:57:13Z des $");
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>

--- 457 unchanged lines hidden (view full) ---

494 if (istmp)
495 ieee80211_free_node(ni);
496}
497
498int
499ieee80211_alloc_challenge(struct ieee80211_node *ni)
500{
501 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>

--- 457 unchanged lines hidden (view full) ---

494 if (istmp)
495 ieee80211_free_node(ni);
496}
497
498int
499ieee80211_alloc_challenge(struct ieee80211_node *ni)
500{
501 if (ni->ni_challenge == NULL)
502 ni->ni_challenge = malloc(IEEE80211_CHALLENGE_LEN,
502 MALLOC(ni->ni_challenge, uint32_t*, IEEE80211_CHALLENGE_LEN,
503 M_80211_NODE, M_NOWAIT);
504 if (ni->ni_challenge == NULL) {
505 IEEE80211_NOTE(ni->ni_vap,
506 IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni,
507 "%s", "shared key challenge alloc failed");
508 /* XXX statistic */
509 }
510 return (ni->ni_challenge != NULL);

--- 428 unchanged lines hidden ---
503 M_80211_NODE, M_NOWAIT);
504 if (ni->ni_challenge == NULL) {
505 IEEE80211_NOTE(ni->ni_vap,
506 IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni,
507 "%s", "shared key challenge alloc failed");
508 /* XXX statistic */
509 }
510 return (ni->ni_challenge != NULL);

--- 428 unchanged lines hidden ---