inet: move inet->recverr_rfc4884 to inet->inet_flags

[platform/kernel/linux-starfive.git] / net / ipv4 / inet_diag.c

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index f742692..6255d6f 100644 (file)
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -182,7 +182,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,
        r->idiag_inode = sock_i_ino(sk);
 
        memset(&inet_sockopt, 0, sizeof(inet_sockopt));
-       inet_sockopt.recverr    = inet->recverr;
+       inet_sockopt.recverr    = inet_test_bit(RECVERR, sk);
        inet_sockopt.is_icsk    = inet->is_icsk;
        inet_sockopt.freebind   = inet->freebind;
        inet_sockopt.hdrincl    = inet->hdrincl;
@@ -191,7 +191,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,
        inet_sockopt.mc_all     = inet->mc_all;
        inet_sockopt.nodefrag   = inet->nodefrag;
        inet_sockopt.bind_address_no_port = inet->bind_address_no_port;
-       inet_sockopt.recverr_rfc4884 = inet->recverr_rfc4884;
+       inet_sockopt.recverr_rfc4884 = inet_test_bit(RECVERR_RFC4884, sk);
        inet_sockopt.defer_connect = inet->defer_connect;
        if (nla_put(skb, INET_DIAG_SOCKOPT, sizeof(inet_sockopt),
                    &inet_sockopt))