From owner-svn-src-head@FreeBSD.ORG  Tue Dec 18 16:15:21 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8ED10D44;
 Tue, 18 Dec 2012 16:15:21 +0000 (UTC)
 (envelope-from monthadar@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 724BF8FC0A;
 Tue, 18 Dec 2012 16:15:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBIGFLML080499;
 Tue, 18 Dec 2012 16:15:21 GMT
 (envelope-from monthadar@svn.freebsd.org)
Received: (from monthadar@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBIGFL8K080498;
 Tue, 18 Dec 2012 16:15:21 GMT
 (envelope-from monthadar@svn.freebsd.org)
Message-Id: <201212181615.qBIGFL8K080498@svn.freebsd.org>
From: Monthadar Al Jaberi <monthadar@FreeBSD.org>
Date: Tue, 18 Dec 2012 16:15:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244400 - head/sys/dev/wtap
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.14
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: Tue, 18 Dec 2012 16:15:21 -0000

Author: monthadar
Date: Tue Dec 18 16:15:20 2012
New Revision: 244400
URL: http://svnweb.freebsd.org/changeset/base/244400

Log:
  wtap should not set the IEEE80211_F_DATAPAD flag;
  
  Approved by: adrian (mentor)

Modified:
  head/sys/dev/wtap/if_wtap.c

Modified: head/sys/dev/wtap/if_wtap.c
==============================================================================
--- head/sys/dev/wtap/if_wtap.c	Tue Dec 18 16:11:13 2012	(r244399)
+++ head/sys/dev/wtap/if_wtap.c	Tue Dec 18 16:15:20 2012	(r244400)
@@ -808,11 +808,7 @@ wtap_attach(struct wtap_softc *sc, const
 	ic->ic_regdomain.location = 1; /* Indoors */
 	ic->ic_regdomain.isocc[0] = 'S';
 	ic->ic_regdomain.isocc[1] = 'E';
-	/*
-	 * Indicate we need the 802.11 header padded to a
-	 * 32-bit boundary for 4-address and QoS frames.
-	 */
-	ic->ic_flags |= IEEE80211_F_DATAPAD;
+
 	ic->ic_nchans = 1;
 	ic->ic_channels[0].ic_flags = IEEE80211_CHAN_B;
 	ic->ic_channels[0].ic_freq = 2412;