diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 18:39:29 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 18:02:22 -0700 |
commit | 114c7844f34c1608aec20ae7ff85cec471ac90ae (patch) | |
tree | f1cd7e413187004d6af8bdd62f20ffa6252d4a0b /net | |
parent | 1b620154273d5cc57690e0d199282c6bb9e56974 (diff) | |
download | op-kernel-dev-114c7844f34c1608aec20ae7ff85cec471ac90ae.zip op-kernel-dev-114c7844f34c1608aec20ae7ff85cec471ac90ae.tar.gz |
[IPV4]: mroute annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index ba49588..97cfa97 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -462,7 +462,7 @@ static int vif_add(struct vifctl *vifc, int mrtsock) return 0; } -static struct mfc_cache *ipmr_cache_find(__u32 origin, __u32 mcastgrp) +static struct mfc_cache *ipmr_cache_find(__be32 origin, __be32 mcastgrp) { int line=MFC_HASH(mcastgrp,origin); struct mfc_cache *c; @@ -1097,7 +1097,7 @@ static struct notifier_block ip_mr_notifier={ * important for multicast video. */ -static void ip_encap(struct sk_buff *skb, u32 saddr, u32 daddr) +static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr) { struct iphdr *iph = (struct iphdr *)skb_push(skb,sizeof(struct iphdr)); |