Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5c78f275e696a25a9919671aa8aa3d0a3d967978

Authored by Al Viro
Committed by David S. Miller
1 parent f6ab028804
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]: IP header modifier helpers annotations. 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 8 additions and 8 deletions Side-by-side Diff

include/net/dsfield.h
Diff comments   View file @ 5c78f27
... ... @@ -27,7 +27,7 @@
27 27 static inline void ipv4_change_dsfield(struct iphdr *iph,__u8 mask,
28 28 __u8 value)
29 29 {
30   - __u32 check = ntohs(iph->check);
  30 + __u32 check = ntohs((__force __be16)iph->check);
31 31 __u8 dsfield;
32 32  
33 33 dsfield = (iph->tos & mask) | value;
... ... @@ -35,7 +35,7 @@
35 35 if ((check+1) >> 16) check = (check+1) & 0xffff;
36 36 check -= dsfield;
37 37 check += check >> 16; /* adjust carry */
38   - iph->check = htons(check);
  38 + iph->check = (__force __sum16)htons(check);
39 39 iph->tos = dsfield;
40 40 }
41 41  
include/net/inet_ecn.h
Diff comments   View file @ 5c78f27
... ... @@ -53,7 +53,7 @@
53 53  
54 54 static inline int IP_ECN_set_ce(struct iphdr *iph)
55 55 {
56   - u32 check = iph->check;
  56 + u32 check = (__force u32)iph->check;
57 57 u32 ecn = (iph->tos + 1) & INET_ECN_MASK;
58 58  
59 59 /*
60 60  
... ... @@ -71,9 +71,9 @@
71 71 * INET_ECN_ECT_1 => check += htons(0xFFFD)
72 72 * INET_ECN_ECT_0 => check += htons(0xFFFE)
73 73 */
74   - check += htons(0xFFFB) + htons(ecn);
  74 + check += (__force u16)htons(0xFFFB) + (__force u16)htons(ecn);
75 75  
76   - iph->check = check + (check>=0xFFFF);
  76 + iph->check = (__force __sum16)(check + (check>=0xFFFF));
77 77 iph->tos |= INET_ECN_CE;
78 78 return 1;
79 79 }
... ... @@ -192,9 +192,9 @@
192 192 static inline
193 193 int ip_decrease_ttl(struct iphdr *iph)
194 194 {
195   - u32 check = iph->check;
196   - check += htons(0x0100);
197   - iph->check = check + (check>=0xFFFF);
  195 + u32 check = (__force u32)iph->check;
  196 + check += (__force u32)htons(0x0100);
  197 + iph->check = (__force __sum16)(check + (check>=0xFFFF));
198 198 return --iph->ttl;
199 199 }
200 200