From 68871cc73e4f5707573e2134e0b1d000bf8c2c70 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Wed, 12 Dec 2007 03:51:49 +0900 Subject: [PATCH] --- yaml --- r: 78459 b: refs/heads/master c: b98999dc382a4e59a250f2ac9e32beca668cba0b h: refs/heads/master i: 78457: c4f8f86a98c1dc6c8f235b3f4d75cd38dde468ed 78455: 58a3b0b3c584fc508a18885fd1898910429ebf03 v: v3 --- [refs] | 2 +- trunk/net/decnet/af_decnet.c | 2 +- trunk/net/decnet/dn_nsp_out.c | 2 +- trunk/net/decnet/dn_route.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5cd7939ff503..a54ba7197b80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91c5ec3ed184b7ca08314457b6e202e3d2cfb65f +refs/heads/master: b98999dc382a4e59a250f2ac9e32beca668cba0b diff --git a/trunk/net/decnet/af_decnet.c b/trunk/net/decnet/af_decnet.c index 57d574951838..acd48ee522d6 100644 --- a/trunk/net/decnet/af_decnet.c +++ b/trunk/net/decnet/af_decnet.c @@ -1904,7 +1904,7 @@ static inline struct sk_buff *dn_alloc_send_pskb(struct sock *sk, struct sk_buff *skb = sock_alloc_send_skb(sk, datalen, noblock, errcode); if (skb) { - skb->protocol = __constant_htons(ETH_P_DNA_RT); + skb->protocol = htons(ETH_P_DNA_RT); skb->pkt_type = PACKET_OUTGOING; } return skb; diff --git a/trunk/net/decnet/dn_nsp_out.c b/trunk/net/decnet/dn_nsp_out.c index 7404653880b0..1964faf203e4 100644 --- a/trunk/net/decnet/dn_nsp_out.c +++ b/trunk/net/decnet/dn_nsp_out.c @@ -124,7 +124,7 @@ struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri) if ((skb = alloc_skb(size + hdr, pri)) == NULL) return NULL; - skb->protocol = __constant_htons(ETH_P_DNA_RT); + skb->protocol = htons(ETH_P_DNA_RT); skb->pkt_type = PACKET_OUTGOING; if (sk) diff --git a/trunk/net/decnet/dn_route.c b/trunk/net/decnet/dn_route.c index b712d0b36526..1ae5efcdbd5f 100644 --- a/trunk/net/decnet/dn_route.c +++ b/trunk/net/decnet/dn_route.c @@ -1551,7 +1551,7 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void kfree_skb(skb); return -ENODEV; } - skb->protocol = __constant_htons(ETH_P_DNA_RT); + skb->protocol = htons(ETH_P_DNA_RT); skb->dev = dev; cb->src = fl.fld_src; cb->dst = fl.fld_dst;