diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 16:36:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 18:08:55 -0500 |
commit | 1958b856c1a59c0f1e892b92debb8c9fe4f364dc (patch) | |
tree | 679e060ad7c1e36ee2e5aec0c686921c66c9bc2c /net/ipv6/raw.c | |
parent | 4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c (diff) |
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.c | 6 |
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) | |||
693 | code = iov->iov_base; | 693 | code = iov->iov_base; |
694 | 694 | ||
695 | if (type && code) { | 695 | if (type && code) { |
696 | if (get_user(fl6->uli.icmpt.type, type) || | 696 | if (get_user(fl6->fl6_icmp_type, type) || |
697 | get_user(fl6->uli.icmpt.code, code)) | 697 | get_user(fl6->fl6_icmp_code, code)) |
698 | return -EFAULT; | 698 | return -EFAULT; |
699 | probed = 1; | 699 | probed = 1; |
700 | } | 700 | } |
@@ -705,7 +705,7 @@ static int rawv6_probe_proto_opt(struct flowi6 *fl6, struct msghdr *msg) | |||
705 | /* check if type field is readable or not. */ | 705 | /* check if type field is readable or not. */ |
706 | if (iov->iov_len > 2 - len) { | 706 | if (iov->iov_len > 2 - len) { |
707 | u8 __user *p = iov->iov_base; | 707 | u8 __user *p = iov->iov_base; |
708 | if (get_user(fl6->uli.mht.type, &p[2 - len])) | 708 | if (get_user(fl6->fl6_mh_type, &p[2 - len])) |
709 | return -EFAULT; | 709 | return -EFAULT; |
710 | probed = 1; | 710 | probed = 1; |
711 | } else | 711 | } else |