diff options
| author |   stsp <stsp@openbsd.org> | 2018-12-06 07:50:38 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2018-12-06 07:50:38 +0000 |
| commit | 044d754c22e30eb37eecb51e33e2b3aa406c0080 (patch) | |
| tree | dff37363550cb4883931c6856a8e0536b566d80d | |
| parent | Use a time-based method for tracking motion states of touches. (diff) | |
| download | wireguard-openbsd-044d754c22e30eb37eecb51e33e2b3aa406c0080.tar.xz wireguard-openbsd-044d754c22e30eb37eecb51e33e2b3aa406c0080.zip | |
Avoid unnecessary dynamic memory allocation in athn_usb_newauth().
Patch by Benjamin Baier
ok ratchov@ mpi@
| -rw-r--r-- | sys/dev/usb/if_athn_usb.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c index 01395b6fb94..39edb129685 100644 --- a/sys/dev/usb/if_athn_usb.c +++ b/sys/dev/usb/if_athn_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_usb.c,v 1.51 2018/09/06 11:50:54 jsg Exp $ */ +/* $OpenBSD: if_athn_usb.c,v 1.52 2018/12/06 07:50:38 stsp Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr> @@ -1202,8 +1202,6 @@ athn_usb_newauth_cb(struct athn_usb_softc *usc, void *arg) struct athn_node *an = (struct athn_node *)ni; int s, error = 0; - free(arg, M_DEVBUF, sizeof(*arg)); - if (ic->ic_state != IEEE80211_S_RUN) return; @@ -1231,7 +1229,7 @@ athn_usb_newauth(struct ieee80211com *ic, struct ieee80211_node *ni, struct ifnet *ifp = &ic->ic_if; struct athn_node *an = (struct athn_node *)ni; int nsta; - struct athn_usb_newauth_cb_arg *arg; + struct athn_usb_newauth_cb_arg arg; if (ic->ic_opmode != IEEE80211_M_HOSTAP) return 0; @@ -1254,12 +1252,9 @@ athn_usb_newauth(struct ieee80211com *ic, struct ieee80211_node *ni, * In a process context, try to add this node to the * firmware table and confirm the AUTH request. */ - arg = malloc(sizeof(*arg), M_DEVBUF, M_NOWAIT); - if (arg == NULL) - return ENOMEM; - arg->ni = ieee80211_ref_node(ni); - arg->seq = seq; - athn_usb_do_async(usc, athn_usb_newauth_cb, arg, sizeof(*arg)); + arg.ni = ieee80211_ref_node(ni); + arg.seq = seq; + athn_usb_do_async(usc, athn_usb_newauth_cb, &arg, sizeof(arg)); return EBUSY; #else return 0; |