Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: Put fl4_* macros to struct flowi4 and use them again.

Signed-off-by: David S. Miller <davem@davemloft.net>

+46 -50
+7 -11
include/net/flow.h
··· 61 61 __be32 daddr; 62 62 __be32 saddr; 63 63 union flowi_uli uli; 64 + #define fl4_sport uli.ports.sport 65 + #define fl4_dport uli.ports.dport 66 + #define fl4_icmp_type uli.icmpt.type 67 + #define fl4_icmp_code uli.icmpt.code 68 + #define fl4_ipsec_spi uli.spi 69 + #define fl4_mh_type uli.mht.type 70 + #define fl4_gre_key uli.gre_key 64 71 }; 65 72 66 73 struct flowi6 { ··· 108 101 #define flowi_proto u.__fl_common.flowic_proto 109 102 #define flowi_flags u.__fl_common.flowic_flags 110 103 #define flowi_secid u.__fl_common.flowic_secid 111 - #define fl4_tos flowi_tos 112 - #define fl4_scope flowi_scope 113 104 #define fld_scope flowi_scope 114 105 115 106 #define fld_dst u.dn.daddr ··· 115 110 #define fl6_dst u.ip6.daddr 116 111 #define fl6_src u.ip6.saddr 117 112 #define fl6_flowlabel u.ip6.flowlabel 118 - #define fl4_dst u.ip4.daddr 119 - #define fl4_src u.ip4.saddr 120 - #define fl4_sport u.ip4.uli.ports.sport 121 - #define fl4_dport u.ip4.uli.ports.dport 122 - #define fl4_icmp_type u.ip4.uli.icmpt.type 123 - #define fl4_icmp_code u.ip4.uli.icmpt.code 124 - #define fl4_ipsec_spi u.ip4.uli.spi 125 - #define fl4_mh_type u.ip4.uli.mht.type 126 - #define fl4_gre_key u.ip4.uli.gre_key 127 113 #define fl6_sport u.ip6.uli.ports.sport 128 114 #define fl6_dport u.ip6.uli.ports.dport 129 115 #define fl6_icmp_type u.ip6.uli.icmpt.type
+7 -7
include/net/route.h
··· 157 157 .saddr = saddr, 158 158 .flowi4_tos = tos, 159 159 .flowi4_proto = proto, 160 - .uli.ports.dport = dport, 161 - .uli.ports.sport = sport, 160 + .fl4_dport = dport, 161 + .fl4_sport = sport, 162 162 }; 163 163 if (sk) 164 164 security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); ··· 175 175 .saddr = saddr, 176 176 .flowi4_tos = tos, 177 177 .flowi4_proto = IPPROTO_GRE, 178 - .uli.gre_key = gre_key, 178 + .fl4_gre_key = gre_key, 179 179 }; 180 180 return ip_route_output_key(net, &fl4); 181 181 } ··· 235 235 .saddr = src, 236 236 .flowi4_tos = tos, 237 237 .flowi4_proto = protocol, 238 - .uli.ports.sport = sport, 239 - .uli.ports.dport = dport, 238 + .fl4_sport = sport, 239 + .fl4_dport = dport, 240 240 }; 241 241 struct net *net = sock_net(sk); 242 242 struct rtable *rt; ··· 273 273 .saddr = rt->rt_key_src, 274 274 .flowi4_tos = rt->rt_tos, 275 275 .flowi4_proto = protocol, 276 - .uli.ports.sport = sport, 277 - .uli.ports.dport = dport 276 + .fl4_sport = sport, 277 + .fl4_dport = dport 278 278 }; 279 279 if (inet_sk(sk)->transparent) 280 280 fl4.flowi4_flags |= FLOWI_FLAG_ANYSRC;
+2 -2
net/dccp/ipv4.c
··· 471 471 .saddr = ip_hdr(skb)->daddr, 472 472 .flowi4_tos = RT_CONN_FLAGS(sk), 473 473 .flowi4_proto = sk->sk_protocol, 474 - .uli.ports.sport = dccp_hdr(skb)->dccph_dport, 475 - .uli.ports.dport = dccp_hdr(skb)->dccph_sport, 474 + .fl4_sport = dccp_hdr(skb)->dccph_dport, 475 + .fl4_dport = dccp_hdr(skb)->dccph_sport, 476 476 }; 477 477 478 478 security_skb_classify_flow(skb, flowi4_to_flowi(&fl4));
+2 -2
net/ipv4/icmp.c
··· 384 384 .saddr = saddr, 385 385 .flowi4_tos = RT_TOS(tos), 386 386 .flowi4_proto = IPPROTO_ICMP, 387 - .uli.icmpt.type = type, 388 - .uli.icmpt.code = code, 387 + .fl4_icmp_type = type, 388 + .fl4_icmp_code = code, 389 389 }; 390 390 struct rtable *rt, *rt2; 391 391 int err;
+2 -2
net/ipv4/inet_connection_sock.c
··· 365 365 .flowi4_tos = RT_CONN_FLAGS(sk), 366 366 .flowi4_proto = sk->sk_protocol, 367 367 .flowi4_flags = inet_sk_flowi_flags(sk), 368 - .uli.ports.sport = inet_sk(sk)->inet_sport, 369 - .uli.ports.dport = ireq->rmt_port, 368 + .fl4_sport = inet_sk(sk)->inet_sport, 369 + .fl4_dport = ireq->rmt_port, 370 370 }; 371 371 struct net *net = sock_net(sk); 372 372
+2 -2
net/ipv4/ip_output.c
··· 1479 1479 .daddr = daddr, 1480 1480 .saddr = rt->rt_spec_dst, 1481 1481 .flowi4_tos = RT_TOS(ip_hdr(skb)->tos), 1482 - .uli.ports.sport = tcp_hdr(skb)->dest, 1483 - .uli.ports.dport = tcp_hdr(skb)->source, 1482 + .fl4_sport = tcp_hdr(skb)->dest, 1483 + .fl4_dport = tcp_hdr(skb)->source, 1484 1484 .flowi4_proto = sk->sk_protocol, 1485 1485 .flowi4_flags = ip_reply_arg_flowi_flags(arg), 1486 1486 };
+2 -2
net/ipv4/netfilter/nf_nat_standalone.c
··· 56 56 t->dst.protonum == IPPROTO_UDPLITE || 57 57 t->dst.protonum == IPPROTO_DCCP || 58 58 t->dst.protonum == IPPROTO_SCTP) 59 - fl4->uli.ports.dport = t->dst.u.tcp.port; 59 + fl4->fl4_dport = t->dst.u.tcp.port; 60 60 } 61 61 62 62 statusbit ^= IPS_NAT_MASK; ··· 68 68 t->dst.protonum == IPPROTO_UDPLITE || 69 69 t->dst.protonum == IPPROTO_DCCP || 70 70 t->dst.protonum == IPPROTO_SCTP) 71 - fl4->uli.ports.sport = t->src.u.tcp.port; 71 + fl4->fl4_sport = t->src.u.tcp.port; 72 72 } 73 73 } 74 74 #endif
+2 -2
net/ipv4/raw.c
··· 433 433 code = iov->iov_base; 434 434 435 435 if (type && code) { 436 - if (get_user(fl4->uli.icmpt.type, type) || 437 - get_user(fl4->uli.icmpt.code, code)) 436 + if (get_user(fl4->fl4_icmp_type, type) || 437 + get_user(fl4->fl4_icmp_code, code)) 438 438 return -EFAULT; 439 439 probed = 1; 440 440 }
+2 -2
net/ipv4/syncookies.c
··· 353 353 .flowi4_tos = RT_CONN_FLAGS(sk), 354 354 .flowi4_proto = IPPROTO_TCP, 355 355 .flowi4_flags = inet_sk_flowi_flags(sk), 356 - .uli.ports.sport = th->dest, 357 - .uli.ports.dport = th->source, 356 + .fl4_sport = th->dest, 357 + .fl4_dport = th->source, 358 358 }; 359 359 security_req_classify_flow(req, flowi4_to_flowi(&fl4)); 360 360 rt = ip_route_output_key(sock_net(sk), &fl4);
+5 -5
net/ipv4/udp.c
··· 778 778 if (!skb) 779 779 goto out; 780 780 781 - err = udp_send_skb(skb, fl4->daddr, fl4->uli.ports.dport); 781 + err = udp_send_skb(skb, fl4->daddr, fl4->fl4_dport); 782 782 783 783 out: 784 784 up->len = 0; ··· 918 918 .flowi4_proto = sk->sk_protocol, 919 919 .flowi4_flags = (inet_sk_flowi_flags(sk) | 920 920 FLOWI_FLAG_CAN_SLEEP), 921 - .uli.ports.sport = inet->inet_sport, 922 - .uli.ports.dport = dport, 921 + .fl4_sport = inet->inet_sport, 922 + .fl4_dport = dport, 923 923 }; 924 924 struct net *net = sock_net(sk); 925 925 ··· 976 976 fl4 = &inet->cork.fl.u.ip4; 977 977 fl4->daddr = daddr; 978 978 fl4->saddr = saddr; 979 - fl4->uli.ports.dport = dport; 980 - fl4->uli.ports.sport = inet->inet_sport; 979 + fl4->fl4_dport = dport; 980 + fl4->fl4_sport = inet->inet_sport; 981 981 up->pending = AF_INET; 982 982 983 983 do_append_data:
+9 -9
net/ipv4/xfrm4_policy.c
··· 119 119 pskb_may_pull(skb, xprth + 4 - skb->data)) { 120 120 __be16 *ports = (__be16 *)xprth; 121 121 122 - fl4->uli.ports.sport = ports[!!reverse]; 123 - fl4->uli.ports.dport = ports[!reverse]; 122 + fl4->fl4_sport = ports[!!reverse]; 123 + fl4->fl4_dport = ports[!reverse]; 124 124 } 125 125 break; 126 126 ··· 128 128 if (pskb_may_pull(skb, xprth + 2 - skb->data)) { 129 129 u8 *icmp = xprth; 130 130 131 - fl4->uli.icmpt.type = icmp[0]; 132 - fl4->uli.icmpt.code = icmp[1]; 131 + fl4->fl4_icmp_type = icmp[0]; 132 + fl4->fl4_icmp_code = icmp[1]; 133 133 } 134 134 break; 135 135 ··· 137 137 if (pskb_may_pull(skb, xprth + 4 - skb->data)) { 138 138 __be32 *ehdr = (__be32 *)xprth; 139 139 140 - fl4->uli.spi = ehdr[0]; 140 + fl4->fl4_ipsec_spi = ehdr[0]; 141 141 } 142 142 break; 143 143 ··· 145 145 if (pskb_may_pull(skb, xprth + 8 - skb->data)) { 146 146 __be32 *ah_hdr = (__be32*)xprth; 147 147 148 - fl4->uli.spi = ah_hdr[1]; 148 + fl4->fl4_ipsec_spi = ah_hdr[1]; 149 149 } 150 150 break; 151 151 ··· 153 153 if (pskb_may_pull(skb, xprth + 4 - skb->data)) { 154 154 __be16 *ipcomp_hdr = (__be16 *)xprth; 155 155 156 - fl4->uli.spi = htonl(ntohs(ipcomp_hdr[1])); 156 + fl4->fl4_ipsec_spi = htonl(ntohs(ipcomp_hdr[1])); 157 157 } 158 158 break; 159 159 ··· 165 165 if (greflags[0] & GRE_KEY) { 166 166 if (greflags[0] & GRE_CSUM) 167 167 gre_hdr++; 168 - fl4->uli.gre_key = gre_hdr[1]; 168 + fl4->fl4_gre_key = gre_hdr[1]; 169 169 } 170 170 } 171 171 break; 172 172 173 173 default: 174 - fl4->uli.spi = 0; 174 + fl4->fl4_ipsec_spi = 0; 175 175 break; 176 176 } 177 177 }
+4 -4
net/sctp/protocol.c
··· 476 476 477 477 memset(&fl4, 0x0, sizeof(struct flowi4)); 478 478 fl4.daddr = daddr->v4.sin_addr.s_addr; 479 - fl4.uli.ports.dport = daddr->v4.sin_port; 479 + fl4.fl4_dport = daddr->v4.sin_port; 480 480 fl4.flowi4_proto = IPPROTO_SCTP; 481 481 if (asoc) { 482 482 fl4.flowi4_tos = RT_CONN_FLAGS(asoc->base.sk); 483 483 fl4.flowi4_oif = asoc->base.sk->sk_bound_dev_if; 484 - fl4.uli.ports.sport = htons(asoc->base.bind_addr.port); 484 + fl4.fl4_sport = htons(asoc->base.bind_addr.port); 485 485 } 486 486 if (saddr) { 487 487 fl4.saddr = saddr->v4.sin_addr.s_addr; 488 - fl4.uli.ports.sport = saddr->v4.sin_port; 488 + fl4.fl4_sport = saddr->v4.sin_port; 489 489 } 490 490 491 491 SCTP_DEBUG_PRINTK("%s: DST:%pI4, SRC:%pI4 - ", ··· 534 534 if ((laddr->state == SCTP_ADDR_SRC) && 535 535 (AF_INET == laddr->a.sa.sa_family)) { 536 536 fl4.saddr = laddr->a.v4.sin_addr.s_addr; 537 - fl4.uli.ports.sport = laddr->a.v4.sin_port; 537 + fl4.fl4_sport = laddr->a.v4.sin_port; 538 538 rt = ip_route_output_key(&init_net, &fl4); 539 539 if (!IS_ERR(rt)) { 540 540 dst = &rt->dst;