add wifi6 8852be driver

hc

2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da

 kernel/net/rxrpc/utils.c
..
..
@@ -1,12 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /* Utility routines
2
3
  *
3
4
  * Copyright (C) 2015 Red Hat, Inc. All Rights Reserved.
4
5
  * Written by David Howells (dhowells@redhat.com)
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- * modify it under the terms of the GNU General Public Licence
8
- * as published by the Free Software Foundation; either version
9
- * 2 of the Licence, or (at your option) any later version.
10
6
  */
11
7
 
12
8
 #include <linux/ip.h>
..
..
@@ -17,28 +13,17 @@
17
13
 /*
18
14
  * Fill out a peer address from a socket buffer containing a packet.
19
15
  */
20
-int rxrpc_extract_addr_from_skb(struct rxrpc_local *local,
21
-				struct sockaddr_rxrpc *srx,
22
-				struct sk_buff *skb)
16
+int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *srx, struct sk_buff *skb)
23
17
 {
24
18
 	memset(srx, 0, sizeof(*srx));
25
19
 
26
20
 	switch (ntohs(skb->protocol)) {
27
21
 	case ETH_P_IP:
28
-		if (local->srx.transport.family == AF_INET6) {
29
-			srx->transport_type = SOCK_DGRAM;
30
-			srx->transport_len = sizeof(srx->transport.sin6);
31
-			srx->transport.sin6.sin6_family = AF_INET6;
32
-			srx->transport.sin6.sin6_port = udp_hdr(skb)->source;
33
-			srx->transport.sin6.sin6_addr.s6_addr32[2] = htonl(0xffff);
34
-			srx->transport.sin6.sin6_addr.s6_addr32[3] = ip_hdr(skb)->saddr;
35
-		} else {
36
-			srx->transport_type = SOCK_DGRAM;
37
-			srx->transport_len = sizeof(srx->transport.sin);
38
-			srx->transport.sin.sin_family = AF_INET;
39
-			srx->transport.sin.sin_port = udp_hdr(skb)->source;
40
-			srx->transport.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
41
-		}
22
+		srx->transport_type = SOCK_DGRAM;
23
+		srx->transport_len = sizeof(srx->transport.sin);
24
+		srx->transport.sin.sin_family = AF_INET;
25
+		srx->transport.sin.sin_port = udp_hdr(skb)->source;
26
+		srx->transport.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
42
27
 		return 0;
43
28
 
44
29
 #ifdef CONFIG_AF_RXRPC_IPV6