summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki2006-10-11 04:41:21 +0200
committerDavid S. Miller2006-10-12 08:59:56 +0200
commit496c98dff8e353880299168d36fa082d6fba5237 (patch)
tree75ec5dfebe4da14d6af415c956bb3c5bc1b5e366 /net/ipv4/ip_gre.c
parent[TCP]: Use TCPOLEN_TSTAMP_ALIGNED macro instead of magic number. (diff)
downloadkernel-qcow2-linux-496c98dff8e353880299168d36fa082d6fba5237.tar.gz
kernel-qcow2-linux-496c98dff8e353880299168d36fa082d6fba5237.tar.xz
kernel-qcow2-linux-496c98dff8e353880299168d36fa082d6fba5237.zip
[NET]: Use hton{l,s}() for non-initializers.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
-rw-r--r--net/ipv4/ip_gre.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index f5fba051df3d..d5b5dec075b8 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -611,8 +611,8 @@ static int ipgre_rcv(struct sk_buff *skb)
* - When dealing with WCCPv2, Skip extra 4 bytes in GRE header
*/
if (flags == 0 &&
- skb->protocol == __constant_htons(ETH_P_WCCP)) {
- skb->protocol = __constant_htons(ETH_P_IP);
+ skb->protocol == htons(ETH_P_WCCP)) {
+ skb->protocol = htons(ETH_P_IP);
if ((*(h + offset) & 0xF0) != 0x40)
offset += 4;
}