From 6e2621c23c35516b6036c2c0d9bb69fd5e1d9376 Mon Sep 17 00:00:00 2001 From: Martin Pieuchot Date: Wed, 19 Mar 2014 10:09:21 +0000 Subject: Stop abusing the rcvif pointer to pass wireless nodes down to the driver start routines. Instead add & use a pointer in the pkthdr since we don't want the overhead of using a mbuf_tags(9). claudio@ pointed out that other subsystems might want to use this pointer too, so here's a new cookie! ok claudio@, mikeb@, deraadt@ --- sys/dev/usb/if_uath.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sys/dev/usb/if_uath.c') diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index ec6852209d2..3b7d76f84e2 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.57 2014/03/07 18:39:02 mpi Exp $ */ +/* $OpenBSD: if_uath.c,v 1.58 2014/03/19 10:09:19 mpi Exp $ */ /*- * Copyright (c) 2006 @@ -1492,8 +1492,7 @@ uath_start(struct ifnet *ifp) } IF_DEQUEUE(&ic->ic_mgtq, m0); - ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif; - m0->m_pkthdr.rcvif = NULL; + ni = m0->m_pkthdr.ph_cookie; #if NBPFILTER > 0 if (ic->ic_rawbpf != NULL) bpf_mtap(ic->ic_rawbpf, m0, BPF_DIRECTION_OUT); -- cgit v1.2.3