Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b9959c2e4460b1df1d113d829180398588bb04b4

Authored by Changli Gao
Committed by David S. Miller
1 parent aca071c1c1
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

net_sched: sch_sfq: use proto_ports_offset() to support AH message 

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 16 additions and 17 deletions Side-by-side Diff

... ... @@ -123,40 +123,39 @@
123 123 case htons(ETH_P_IP):
124 124 {
125 125 const struct iphdr *iph;
  126 + int poff;
126 127  
127 128 if (!pskb_network_may_pull(skb, sizeof(*iph)))
128 129 goto err;
129 130 iph = ip_hdr(skb);
130 131 h = (__force u32)iph->daddr;
131 132 h2 = (__force u32)iph->saddr ^ iph->protocol;
132   - if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
133   - (iph->protocol == IPPROTO_TCP ||
134   - iph->protocol == IPPROTO_UDP ||
135   - iph->protocol == IPPROTO_UDPLITE ||
136   - iph->protocol == IPPROTO_SCTP ||
137   - iph->protocol == IPPROTO_DCCP ||
138   - iph->protocol == IPPROTO_ESP) &&
139   - pskb_network_may_pull(skb, iph->ihl * 4 + 4))
140   - h2 ^= *(((u32*)iph) + iph->ihl);
  133 + if (iph->frag_off & htons(IP_MF|IP_OFFSET))
  134 + break;
  135 + poff = proto_ports_offset(iph->protocol);
  136 + if (poff >= 0 &&
  137 + pskb_network_may_pull(skb, iph->ihl * 4 + 4 + poff)) {
  138 + iph = ip_hdr(skb);
  139 + h2 ^= *(u32*)((void *)iph + iph->ihl * 4 + poff);
  140 + }
141 141 break;
142 142 }
143 143 case htons(ETH_P_IPV6):
144 144 {
145 145 struct ipv6hdr *iph;
  146 + int poff;
146 147  
147 148 if (!pskb_network_may_pull(skb, sizeof(*iph)))
148 149 goto err;
149 150 iph = ipv6_hdr(skb);
150 151 h = (__force u32)iph->daddr.s6_addr32[3];
151 152 h2 = (__force u32)iph->saddr.s6_addr32[3] ^ iph->nexthdr;
152   - if ((iph->nexthdr == IPPROTO_TCP ||
153   - iph->nexthdr == IPPROTO_UDP ||
154   - iph->nexthdr == IPPROTO_UDPLITE ||
155   - iph->nexthdr == IPPROTO_SCTP ||
156   - iph->nexthdr == IPPROTO_DCCP ||
157   - iph->nexthdr == IPPROTO_ESP) &&
158   - pskb_network_may_pull(skb, sizeof(*iph) + 4))
159   - h2 ^= *(u32*)&iph[1];
  153 + poff = proto_ports_offset(iph->nexthdr);
  154 + if (poff >= 0 &&
  155 + pskb_network_may_pull(skb, sizeof(*iph) + 4 + poff)) {
  156 + iph = ipv6_hdr(skb);
  157 + h2 ^= *(u32*)((void *)iph + sizeof(*iph) + poff);
  158 + }
160 159 break;
161 160 }
162 161 default: