From patchwork Mon Aug 25 07:59:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 382649 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B4C211400B2 for ; Mon, 25 Aug 2014 18:01:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754749AbaHYIAE (ORCPT ); Mon, 25 Aug 2014 04:00:04 -0400 Received: from mail-la0-f45.google.com ([209.85.215.45]:44605 "EHLO mail-la0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754571AbaHYIAC (ORCPT ); Mon, 25 Aug 2014 04:00:02 -0400 Received: by mail-la0-f45.google.com with SMTP id ty20so12410180lab.32 for ; Mon, 25 Aug 2014 01:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=X8CSA2qIBoWbv8/87mkHKKGP0+mzRhp4Wq8+CG5nQBw=; b=N86cyQTxoqtXCRgA9qah+zQzsu0doz7ED/+UR/2CihUxkv76gWeHb4uO7NOJJe2y9s mLtsLWgPgF1ibV816b0LdLXfDgcc+fp70zPZMzthigce+gtsMx138kAyQL9xDh8DmBMH AO+cx2UMZue2AbW+YRO0cTZBWSxgGp5XvTMd4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=X8CSA2qIBoWbv8/87mkHKKGP0+mzRhp4Wq8+CG5nQBw=; b=j5dbEmkgDkHzu347xEH8SDQHN78nLQ/2JwEEDnmJ8YQ/h4yovNYshbkyQAI1iIWq7s uKdboaWpQtUy0dG2vOEnI5NrwXw19H2BXayEf15U637R2qqmZdmvksiTo9bcnInqQsnP 12hBrI/1hUdIoBObx6SJZ1X7Zb0OfpOpA1UJNJUK7xPuwtoFwGvxtfLZrZzvtg+021Z8 LQe7tgwVgke0QFZJHGsGEdfnTfvoW92IPBg7MJ7W6oPPOtTctLQdaCFp+/Iw+gvdQXLb KtXOUyOG1YR7HB9NO0UcFCw4zt3Qmtd/BbW4CAKjt2GpZ5p/y12hwgTNTKrlUTi8xxyT byLA== X-Gm-Message-State: ALoCoQmcXjL8p3nlg7RDquHi+X4F4iLJF9/SeDWApLJ1IM3SvOOB7+IlY1lpxWCX8yThQQ3fj0q4 X-Received: by 10.152.120.38 with SMTP id kz6mr19911731lab.8.1408953600251; Mon, 25 Aug 2014 01:00:00 -0700 (PDT) Received: from spencer.imf.au.dk ([130.225.20.51]) by mx.google.com with ESMTPSA id dk4sm61491327lbb.38.2014.08.25.00.59.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Aug 2014 00:59:59 -0700 (PDT) From: Rasmus Villemoes To: "John W. Linville" , Kalle Valo Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Rasmus Villemoes Subject: [PATCH v2] ray_cs: Add include guards Date: Mon, 25 Aug 2014 09:59:29 +0200 Message-Id: <1408953569-5647-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.0.4 In-Reply-To: <87ppfq85bh.fsf@purkki.adurom.net> References: <87ppfq85bh.fsf@purkki.adurom.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The files ray_cs.h and rayctl.h both contain two thirds of what appears to be an include guard using the macro name RAYLINK_H (both lack the #define). Since RAYLINK_H is not defined anywhere, the #ifndefs are confusing no-ops. Add proper include guards using different macro names. Signed-off-by: Rasmus Villemoes --- Notes: v2: Change subject prefix and fix broken commit message. drivers/net/wireless/ray_cs.h | 5 +++-- drivers/net/wireless/rayctl.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ray_cs.h b/drivers/net/wireless/ray_cs.h index e79848f..524c2f0 100644 --- a/drivers/net/wireless/ray_cs.h +++ b/drivers/net/wireless/ray_cs.h @@ -3,7 +3,8 @@ Written by Corey Thomas */ -#ifndef RAYLINK_H +#ifndef _RAY_CS_H_ +#define _RAY_CS_H_ struct beacon_rx { struct mac_header mac; @@ -69,4 +70,4 @@ typedef struct ray_dev_t { } ray_dev_t; /*****************************************************************************/ -#endif /* RAYLINK_H */ +#endif /* _RAY_CS_H_ */ diff --git a/drivers/net/wireless/rayctl.h b/drivers/net/wireless/rayctl.h index 3c3b98b..b21ed64 100644 --- a/drivers/net/wireless/rayctl.h +++ b/drivers/net/wireless/rayctl.h @@ -1,4 +1,5 @@ -#ifndef RAYLINK_H +#ifndef _RAYCTL_H_ +#define _RAYCTL_H_ typedef unsigned char UCHAR; @@ -729,4 +730,4 @@ typedef struct snaphdr_t #define RAY_IPX_TYPE 0x8137 #define APPLEARP_TYPE 0x80f3 /*****************************************************************************/ -#endif /* #ifndef RAYLINK_H */ +#endif /* _RAYCTL_H_ */