From patchwork Thu Jul 30 12:14:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 6902281 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B7AB69F39D for ; Thu, 30 Jul 2015 12:14:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CFCC2205B4 for ; Thu, 30 Jul 2015 12:14:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D34020591 for ; Thu, 30 Jul 2015 12:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752867AbbG3MOy (ORCPT ); Thu, 30 Jul 2015 08:14:54 -0400 Received: from static.88-198-24-112.clients.your-server.de ([88.198.24.112]:39663 "EHLO nbd.name" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752859AbbG3MOx (ORCPT ); Thu, 30 Jul 2015 08:14:53 -0400 Received: by nf.local (Postfix, from userid 501) id 399C0F417F7E; Thu, 30 Jul 2015 14:14:47 +0200 (CEST) From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net Subject: [PATCH] mac80211: make local->tx_headroom a multiple of 4 Date: Thu, 30 Jul 2015 14:14:47 +0200 Message-Id: <1438258487-74594-1-git-send-email-nbd@openwrt.org> X-Mailer: git-send-email 2.2.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This ensures that mac80211 generated management frames and beacons are aligned before being passed to the driver Signed-off-by: Felix Fietkau --- net/mac80211/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index ff79a13..e8b9224 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1034,6 +1034,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) */ local->tx_headroom = max_t(unsigned int , local->hw.extra_tx_headroom, IEEE80211_TX_STATUS_HEADROOM); + local->tx_headroom = ALIGN(local->tx_headroom, 4); debugfs_hw_add(local);