Merge tag 'perf-urgent-for-mingo-4.14-20170912' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / net / rxrpc / utils.c

diff --git a/net/rxrpc/utils.c b/net/rxrpc/utils.c
index ff7af71..e801171 100644 (file)
--- a/net/rxrpc/utils.c
+++ b/net/rxrpc/utils.c
@@ -17,17 +17,28 @@
 /*
  * Fill out a peer address from a socket buffer containing a packet.
  */
-int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *srx, struct sk_buff *skb)
+int rxrpc_extract_addr_from_skb(struct rxrpc_local *local,
+                               struct sockaddr_rxrpc *srx,
+                               struct sk_buff *skb)
 {
        memset(srx, 0, sizeof(*srx));
 
        switch (ntohs(skb->protocol)) {
        case ETH_P_IP:
-               srx->transport_type = SOCK_DGRAM;
-               srx->transport_len = sizeof(srx->transport.sin);
-               srx->transport.sin.sin_family = AF_INET;
-               srx->transport.sin.sin_port = udp_hdr(skb)->source;
-               srx->transport.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
+               if (local->srx.transport.family == AF_INET6) {
+                       srx->transport_type = SOCK_DGRAM;
+                       srx->transport_len = sizeof(srx->transport.sin6);
+                       srx->transport.sin6.sin6_family = AF_INET6;
+                       srx->transport.sin6.sin6_port = udp_hdr(skb)->source;
+                       srx->transport.sin6.sin6_addr.s6_addr32[2] = htonl(0xffff);
+                       srx->transport.sin6.sin6_addr.s6_addr32[3] = ip_hdr(skb)->saddr;
+               } else {
+                       srx->transport_type = SOCK_DGRAM;
+                       srx->transport_len = sizeof(srx->transport.sin);
+                       srx->transport.sin.sin_family = AF_INET;
+                       srx->transport.sin.sin_port = udp_hdr(skb)->source;
+                       srx->transport.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
+               }
                return 0;
 
 #ifdef CONFIG_AF_RXRPC_IPV6