From owner-svn-src-user@FreeBSD.ORG  Thu Apr 25 08:33:23 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7AA1BDA4;
 Thu, 25 Apr 2013 08:33:23 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6CFA615BB;
 Thu, 25 Apr 2013 08:33:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3P8XM64071067;
 Thu, 25 Apr 2013 08:33:22 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3P8XM76071066;
 Thu, 25 Apr 2013 08:33:22 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201304250833.r3P8XM76071066@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 25 Apr 2013 08:33:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r249885 - user/adrian/net80211_tx/sys/dev/ath
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Apr 2013 08:33:23 -0000

Author: adrian
Date: Thu Apr 25 08:33:22 2013
New Revision: 249885
URL: http://svnweb.freebsd.org/changeset/base/249885

Log:
  Handle NULL payload ALQ messages.

Modified:
  user/adrian/net80211_tx/sys/dev/ath/if_ath_alq.c

Modified: user/adrian/net80211_tx/sys/dev/ath/if_ath_alq.c
==============================================================================
--- user/adrian/net80211_tx/sys/dev/ath/if_ath_alq.c	Thu Apr 25 07:04:56 2013	(r249884)
+++ user/adrian/net80211_tx/sys/dev/ath/if_ath_alq.c	Thu Apr 25 08:33:22 2013	(r249885)
@@ -184,9 +184,11 @@ if_ath_alq_post(struct if_ath_alq *alq, 
 	/*
 	 * Copy the payload _after_ the header field.
 	 */
-	memcpy(((char *) ap) + sizeof(struct if_ath_alq_hdr),
-	    buf,
-	    len);
+	if (buf != NULL) {
+		memcpy(((char *) ap) + sizeof(struct if_ath_alq_hdr),
+		    buf,
+		    len);
+	}
 
 	alq_post(alq->sc_alq_alq, ale);
 }