mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: netdev@vger.kernel.org
Cc: Patrick McHardy <kaber@trash.net>,
	"David S. Miller" <davem@davemloft.net>,
	linux-kernel@vger.kernel.org
Subject: [PATCH net-next 1/6] 8021q: Convert uses of __constant_<foo> to <foo>
Date: Wed, 12 Mar 2014 10:04:15 -0700	[thread overview]
Message-ID: <c44725e4804d6e64f44263bfcb4d4c3d2d057db4.1394643455.git.joe@perches.com> (raw)
In-Reply-To: <cover.1394643455.git.joe@perches.com>

The use of __constant_<foo> has been unnecessary for quite awhile now.

Make these uses consistent with the rest of the kernel.

Signed-off-by: Joe Perches <joe@perches.com>
---
 net/8021q/vlan.h         | 4 ++--
 net/8021q/vlan_netlink.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 5704ed9..9d010a09 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -38,9 +38,9 @@ struct vlan_info {
 static inline unsigned int vlan_proto_idx(__be16 proto)
 {
 	switch (proto) {
-	case __constant_htons(ETH_P_8021Q):
+	case htons(ETH_P_8021Q):
 		return VLAN_PROTO_8021Q;
-	case __constant_htons(ETH_P_8021AD):
+	case htons(ETH_P_8021AD):
 		return VLAN_PROTO_8021AD;
 	default:
 		BUG();
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
index c7e634a..8ac8a5c 100644
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -56,8 +56,8 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[])
 
 	if (data[IFLA_VLAN_PROTOCOL]) {
 		switch (nla_get_be16(data[IFLA_VLAN_PROTOCOL])) {
-		case __constant_htons(ETH_P_8021Q):
-		case __constant_htons(ETH_P_8021AD):
+		case htons(ETH_P_8021Q):
+		case htons(ETH_P_8021AD):
 			break;
 		default:
 			return -EPROTONOSUPPORT;
-- 
1.8.1.2.459.gbcd45b4.dirty


  reply	other threads:[~2014-03-12 17:04 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-12 17:04 [PATCH net-next 0/6] net: " Joe Perches
2014-03-12 17:04 ` Joe Perches [this message]
2014-03-12 19:28   ` [PATCH net-next 1/6] 8021q: " David Miller
2014-03-12 17:04 ` [PATCH net-next 2/6] bluetooth: " Joe Perches
2014-03-12 17:26   ` Marcel Holtmann
2014-03-12 17:52     ` [PATCH V2 bluetooth-next " Joe Perches
2014-03-12 18:11       ` Marcel Holtmann
2014-03-12 18:22         ` Joe Perches
2014-03-12 19:28   ` [PATCH net-next " David Miller
2014-03-12 17:04 ` [PATCH net-next 3/6] net: " Joe Perches
2014-03-12 19:28   ` David Miller
2014-03-12 17:04 ` [PATCH net-next 4/6] ieee802154: " Joe Perches
2014-03-12 19:28   ` David Miller
2014-03-12 17:04 ` [PATCH net-next 5/6] netfilter: " Joe Perches
2014-03-12 19:28   ` David Miller
2014-03-13 13:13     ` Pablo Neira Ayuso
2014-03-12 19:41   ` Jozsef Kadlecsik
2014-03-12 17:04 ` [PATCH net-next 6/6] tipc: " Joe Perches
2014-03-12 19:29   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c44725e4804d6e64f44263bfcb4d4c3d2d057db4.1394643455.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=davem@davemloft.net \
    --cc=kaber@trash.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®