summaryrefslogtreecommitdiffstats
path: root/net/ipv6/raw.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-12 16:36:19 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-12 15:08:55 -0800
commit1958b856c1a59c0f1e892b92debb8c9fe4f364dc (patch)
tree679e060ad7c1e36ee2e5aec0c686921c66c9bc2c /net/ipv6/raw.c
parent4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c (diff)
downloadlinux-1958b856c1a59c0f1e892b92debb8c9fe4f364dc.tar.gz
linux-1958b856c1a59c0f1e892b92debb8c9fe4f364dc.tar.bz2
linux-1958b856c1a59c0f1e892b92debb8c9fe4f364dc.zip
net: Put fl6_* macros to struct flowi6 and use them again.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r--net/ipv6/raw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 259f1b231038..4a1c3b46c56b 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -693,8 +693,8 @@ static int rawv6_probe_proto_opt(struct flowi6 *fl6, struct msghdr *msg)
code = iov->iov_base;
if (type && code) {
- if (get_user(fl6->uli.icmpt.type, type) ||
- get_user(fl6->uli.icmpt.code, code))
+ if (get_user(fl6->fl6_icmp_type, type) ||
+ get_user(fl6->fl6_icmp_code, code))
return -EFAULT;
probed = 1;
}
@@ -705,7 +705,7 @@ static int rawv6_probe_proto_opt(struct flowi6 *fl6, struct msghdr *msg)
/* check if type field is readable or not. */
if (iov->iov_len > 2 - len) {
u8 __user *p = iov->iov_base;
- if (get_user(fl6->uli.mht.type, &p[2 - len]))
+ if (get_user(fl6->fl6_mh_type, &p[2 - len]))
return -EFAULT;
probed = 1;
} else