From patchwork Tue Oct 18 13:57:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16741 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 2465983068; Tue, 18 Oct 2016 15:58:42 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=narfation.org Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=narfation.org header.i=@narfation.org header.b=fDj0e72s; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=pass header.from=narfation.org Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id 9849383050 for ; Tue, 18 Oct 2016 15:58:01 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p2003007C6F65A2FE1DF6D8826931E1EC.dip0.t-ipconnect.de [IPv6:2003:7c:6f65:a2fe:1df6:d882:6931:e1ec]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 1447C1C8001; Tue, 18 Oct 2016 15:58:01 +0200 (CEST) Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1476799081; bh=6u00NG6nn5pTEVAhB4OJE/++d4X/MUqAXuqa1USbLR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fDj0e72sfU0xuVG4/ZGUryz1sldkh2lE6ZDJIsf22CJLyRjNiIODZ3JTZ1ZTK7ERJ +5PPKc96zbVhXOq0pLRw//v24BLDdPyyeAGRfsJfEwuIx/krA5wYKh39rc7xHYIrOR vWwybJxNGNhSDkWWjpXlVWrISOv2dPmfZ+P9K4Dk= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 18 Oct 2016 15:57:41 +0200 Message-Id: <20161018135743.3705-6-sven@narfation.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <2219629.dYY2ZvZvNG@bentobox> References: <2219629.dYY2ZvZvNG@bentobox> Subject: [B.A.T.M.A.N.] [PATCH v3 6/8] batman-adv: compat: Replace IFF_NO_QUEUE with coccinelle X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" Signed-off-by: Sven Eckelmann --- v3: - no changes v2: - new patch --- compat-patches/0003-iff-no-queue.cocci | 9 +++++++++ compat.h | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 compat-patches/0003-iff-no-queue.cocci diff --git a/compat-patches/0003-iff-no-queue.cocci b/compat-patches/0003-iff-no-queue.cocci new file mode 100644 index 0000000..9c95b85 --- /dev/null +++ b/compat-patches/0003-iff-no-queue.cocci @@ -0,0 +1,9 @@ +@@ +expression E; +@@ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) + E->priv_flags |= IFF_NO_QUEUE; ++#else ++E->tx_queue_len = 0; ++#endif diff --git a/compat.h b/compat.h index 78de7ea..245621f 100644 --- a/compat.h +++ b/compat.h @@ -152,10 +152,4 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(4, 0, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) - -#define IFF_NO_QUEUE 0; dev->tx_queue_len = 0 - -#endif /* < KERNEL_VERSION(4, 3, 0) */ - #endif /* _NET_BATMAN_ADV_COMPAT_H_ */