1 files changed, 22 insertions, 10 deletions

diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index 777c3ed4cfc0..94d234e9c685 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -135,10 +135,10 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
         }
 
         switch (local->srx.transport.family) {
-        case AF_INET:
-                /* we want to receive ICMP errors */
+        case AF_INET6:
+                /* we want to receive ICMPv6 errors */
                 opt = 1;
-                ret = kernel_setsockopt(local->socket, SOL_IP, IP_RECVERR,
+                ret = kernel_setsockopt(local->socket, SOL_IPV6, IPV6_RECVERR,
                                         (char *) &opt, sizeof(opt));
                 if (ret < 0) {
                         _debug("setsockopt failed");
@@ -146,19 +146,22 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
                 }
 
                 /* we want to set the don't fragment bit */
-                opt = IP_PMTUDISC_DO;
-                ret = kernel_setsockopt(local->socket, SOL_IP, IP_MTU_DISCOVER,
+                opt = IPV6_PMTUDISC_DO;
+                ret = kernel_setsockopt(local->socket, SOL_IPV6, IPV6_MTU_DISCOVER,
                                         (char *) &opt, sizeof(opt));
                 if (ret < 0) {
                         _debug("setsockopt failed");
                         goto error;
                 }
-                break;
 
-        case AF_INET6:
+                /* Fall through and set IPv4 options too otherwise we don't get
+                 * errors from IPv4 packets sent through the IPv6 socket.
+                 */
+
+        case AF_INET:
                 /* we want to receive ICMP errors */
                 opt = 1;
-                ret = kernel_setsockopt(local->socket, SOL_IPV6, IPV6_RECVERR,
+                ret = kernel_setsockopt(local->socket, SOL_IP, IP_RECVERR,
                                         (char *) &opt, sizeof(opt));
                 if (ret < 0) {
                         _debug("setsockopt failed");
@@ -166,13 +169,22 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
                 }
 
                 /* we want to set the don't fragment bit */
-                opt = IPV6_PMTUDISC_DO;
-                ret = kernel_setsockopt(local->socket, SOL_IPV6, IPV6_MTU_DISCOVER,
+                opt = IP_PMTUDISC_DO;
+                ret = kernel_setsockopt(local->socket, SOL_IP, IP_MTU_DISCOVER,
                                         (char *) &opt, sizeof(opt));
                 if (ret < 0) {
                         _debug("setsockopt failed");
                         goto error;
                 }
+
+                /* We want receive timestamps. */
+                opt = 1;
+                ret = kernel_setsockopt(local->socket, SOL_SOCKET, SO_TIMESTAMPNS,
+                                        (char *)&opt, sizeof(opt));
+                if (ret < 0) {
+                        _debug("setsockopt failed");
+                        goto error;
+                }
                 break;
 
         default: