From: Joe Perches <joe@perches.com>
To: netdev@vger.kernel.org
Cc: Michal Simek <michal.simek@xilinx.com>,
Anirudha Sarangi <anirudh@xilinx.com>,
John Linn <John.Linn@xilinx.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next 7/9] xilinx: Convert uses of __constant_<foo> to <foo>
Date: Wed, 12 Mar 2014 10:22:36 -0700 [thread overview]
Message-ID: <2722ce785ea17ccd8bdbb20f0accd89232aa2b2a.1394644825.git.joe@perches.com> (raw)
In-Reply-To: <cover.1394644825.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>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++--
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index a434750..fa193c4 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -771,8 +771,8 @@ static void ll_temac_recv(struct net_device *ndev)
/* if we're doing rx csum offload, set it up */
if (((lp->temac_features & TEMAC_FEATURE_RX_CSUM) != 0) &&
- (skb->protocol == __constant_htons(ETH_P_IP)) &&
- (skb->len > 64)) {
+ (skb->protocol == htons(ETH_P_IP)) &&
+ (skb->len > 64)) {
skb->csum = cur_p->app3 & 0xFFFF;
skb->ip_summed = CHECKSUM_COMPLETE;
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 4bfdf8c..7b0a735 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -756,7 +756,7 @@ static void axienet_recv(struct net_device *ndev)
skb->ip_summed = CHECKSUM_UNNECESSARY;
}
} else if ((lp->features & XAE_FEATURE_PARTIAL_RX_CSUM) != 0 &&
- skb->protocol == __constant_htons(ETH_P_IP) &&
+ skb->protocol == htons(ETH_P_IP) &&
skb->len > 64) {
skb->csum = be32_to_cpu(cur_p->app3 & 0xFFFF);
skb->ip_summed = CHECKSUM_COMPLETE;
--
1.8.1.2.459.gbcd45b4.dirty
next prev parent reply other threads:[~2014-03-12 17:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 17:22 [PATCH net-next 0/9] drivers/net: " Joe Perches
2014-03-12 17:22 ` [PATCH net-next 1/9] brocade: " Joe Perches
2014-03-12 19:30 ` David Miller
2014-03-12 17:22 ` [PATCH net-next 2/9] e100: " Joe Perches
2014-03-12 19:30 ` David Miller
2014-03-12 20:50 ` Jeff Kirsher
2014-03-12 17:22 ` [PATCH net-next 3/9] igb: " Joe Perches
2014-03-12 19:30 ` David Miller
2014-03-12 20:50 ` Jeff Kirsher
2014-03-12 17:22 ` [PATCH net-next 4/9] igbvf: " Joe Perches
2014-03-12 19:29 ` David Miller
2014-03-12 20:50 ` Jeff Kirsher
2014-03-12 17:22 ` [PATCH net-next 5/9] ixgbe: " Joe Perches
2014-03-12 19:29 ` David Miller
2014-03-12 20:50 ` Jeff Kirsher
2014-03-12 17:22 ` [PATCH net-next 6/9] ixgbevf: " Joe Perches
2014-03-12 19:29 ` David Miller
2014-03-12 20:51 ` Jeff Kirsher
2014-03-12 17:22 ` Joe Perches [this message]
2014-03-12 19:29 ` [PATCH net-next 7/9] xilinx: " David Miller
2014-03-12 17:22 ` [PATCH net-next 8/9] lg-vl600: " Joe Perches
2014-03-12 19:29 ` David Miller
2014-03-12 17:22 ` [PATCH net-next 9/9] ath9k: " 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=2722ce785ea17ccd8bdbb20f0accd89232aa2b2a.1394644825.git.joe@perches.com \
--to=joe@perches.com \
--cc=John.Linn@xilinx.com \
--cc=anirudh@xilinx.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--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®