From owner-svn-src-head@FreeBSD.ORG  Thu Jun  4 23:07:22 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 41BA163F;
 Thu,  4 Jun 2015 23:07:22 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2FE9D10CD;
 Thu,  4 Jun 2015 23:07:22 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t54N7MnO077960;
 Thu, 4 Jun 2015 23:07:22 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t54N7M1B077959;
 Thu, 4 Jun 2015 23:07:22 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201506042307.t54N7M1B077959@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 4 Jun 2015 23:07:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284003 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jun 2015 23:07:22 -0000

Author: adrian
Date: Thu Jun  4 23:07:21 2015
New Revision: 284003
URL: https://svnweb.freebsd.org/changeset/base/284003

Log:
  Some hostap setups may result in raw frames being transmitted with
  no parameters set.  So, don't unconditionally call things.
  
  Thanks to jkim@ for pointing this out!
  
  MFC after:	2 weeks
  Sponsored by:	Norse Corp, Inc.

Modified:
  head/sys/net80211/ieee80211_output.c

Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c	Thu Jun  4 22:11:39 2015	(r284002)
+++ head/sys/net80211/ieee80211_output.c	Thu Jun  4 23:07:21 2015	(r284003)
@@ -525,7 +525,8 @@ ieee80211_raw_output(struct ieee80211vap
 	 * they'll have to be added - so fail the transmit if
 	 * they can't be.
 	 */
-	(void) ieee80211_add_xmit_params(m, params);
+	if (params)
+		(void) ieee80211_add_xmit_params(m, params);
 
 	return (ic->ic_raw_xmit(ni, m, params));
 }