Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 183cad12785ffc036571c4b789dc084ec61a1bad

Authored by David S. Miller
1 parent dd701754e7
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

xfrm: Const'ify pointer args to km_migrate() and implementations. 

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

Showing 4 changed files with 34 additions and 30 deletions Side-by-side Diff

... ... @@ -556,7 +556,11 @@
556 556 int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
557 557 int (*notify_policy)(struct xfrm_policy *x, int dir, const struct km_event *c);
558 558 int (*report)(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
559   - int (*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles, struct xfrm_kmaddress *k);
  559 + int (*migrate)(const struct xfrm_selector *sel,
  560 + u8 dir, u8 type,
  561 + const struct xfrm_migrate *m,
  562 + int num_bundles,
  563 + const struct xfrm_kmaddress *k);
560 564 };
561 565  
562 566 extern int xfrm_register_km(struct xfrm_mgr *km);
... ... @@ -1483,9 +1487,9 @@
1483 1487 extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
1484 1488  
1485 1489 #ifdef CONFIG_XFRM_MIGRATE
1486   -extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
1487   - struct xfrm_migrate *m, int num_bundles,
1488   - struct xfrm_kmaddress *k);
  1490 +extern int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
  1491 + const struct xfrm_migrate *m, int num_bundles,
  1492 + const struct xfrm_kmaddress *k);
1489 1493 extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m);
1490 1494 extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x,
1491 1495 struct xfrm_migrate *m);
... ... @@ -690,7 +690,7 @@
690 690 }
691 691 }
692 692  
693   -static unsigned int pfkey_sockaddr_fill(xfrm_address_t *xaddr, __be16 port,
  693 +static unsigned int pfkey_sockaddr_fill(const xfrm_address_t *xaddr, __be16 port,
694 694 struct sockaddr *sa,
695 695 unsigned short family)
696 696 {
... ... @@ -3318,7 +3318,7 @@
3318 3318  
3319 3319 #ifdef CONFIG_NET_KEY_MIGRATE
3320 3320 static int set_sadb_address(struct sk_buff *skb, int sasize, int type,
3321   - struct xfrm_selector *sel)
  3321 + const struct xfrm_selector *sel)
3322 3322 {
3323 3323 struct sadb_address *addr;
3324 3324 addr = (struct sadb_address *)skb_put(skb, sizeof(struct sadb_address) + sasize);
... ... @@ -3348,7 +3348,7 @@
3348 3348 }
3349 3349  
3350 3350  
3351   -static int set_sadb_kmaddress(struct sk_buff *skb, struct xfrm_kmaddress *k)
  3351 +static int set_sadb_kmaddress(struct sk_buff *skb, const struct xfrm_kmaddress *k)
3352 3352 {
3353 3353 struct sadb_x_kmaddress *kma;
3354 3354 u8 *sa;
... ... @@ -3376,7 +3376,7 @@
3376 3376 static int set_ipsecrequest(struct sk_buff *skb,
3377 3377 uint8_t proto, uint8_t mode, int level,
3378 3378 uint32_t reqid, uint8_t family,
3379   - xfrm_address_t *src, xfrm_address_t *dst)
  3379 + const xfrm_address_t *src, const xfrm_address_t *dst)
3380 3380 {
3381 3381 struct sadb_x_ipsecrequest *rq;
3382 3382 u8 *sa;
... ... @@ -3404,9 +3404,9 @@
3404 3404 #endif
3405 3405  
3406 3406 #ifdef CONFIG_NET_KEY_MIGRATE
3407   -static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
3408   - struct xfrm_migrate *m, int num_bundles,
3409   - struct xfrm_kmaddress *k)
  3407 +static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
  3408 + const struct xfrm_migrate *m, int num_bundles,
  3409 + const struct xfrm_kmaddress *k)
3410 3410 {
3411 3411 int i;
3412 3412 int sasize_sel;
... ... @@ -3415,7 +3415,7 @@
3415 3415 struct sk_buff *skb;
3416 3416 struct sadb_msg *hdr;
3417 3417 struct sadb_x_policy *pol;
3418   - struct xfrm_migrate *mp;
  3418 + const struct xfrm_migrate *mp;
3419 3419  
3420 3420 if (type != XFRM_POLICY_TYPE_MAIN)
3421 3421 return 0;
... ... @@ -3513,9 +3513,9 @@
3513 3513 return -EINVAL;
3514 3514 }
3515 3515 #else
3516   -static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
3517   - struct xfrm_migrate *m, int num_bundles,
3518   - struct xfrm_kmaddress *k)
  3516 +static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
  3517 + const struct xfrm_migrate *m, int num_bundles,
  3518 + const struct xfrm_kmaddress *k)
3519 3519 {
3520 3520 return -ENOPROTOOPT;
3521 3521 }
net/xfrm/xfrm_state.c
Diff comments   View file @ 183cad1
... ... @@ -1819,9 +1819,9 @@
1819 1819 EXPORT_SYMBOL(km_policy_expired);
1820 1820  
1821 1821 #ifdef CONFIG_XFRM_MIGRATE
1822   -int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
1823   - struct xfrm_migrate *m, int num_migrate,
1824   - struct xfrm_kmaddress *k)
  1822 +int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
  1823 + const struct xfrm_migrate *m, int num_migrate,
  1824 + const struct xfrm_kmaddress *k)
1825 1825 {
1826 1826 int err = -EINVAL;
1827 1827 int ret;
net/xfrm/xfrm_user.c
Diff comments   View file @ 183cad1
... ... @@ -1986,7 +1986,7 @@
1986 1986 #endif
1987 1987  
1988 1988 #ifdef CONFIG_XFRM_MIGRATE
1989   -static int copy_to_user_migrate(struct xfrm_migrate *m, struct sk_buff *skb)
  1989 +static int copy_to_user_migrate(const struct xfrm_migrate *m, struct sk_buff *skb)
1990 1990 {
1991 1991 struct xfrm_user_migrate um;
1992 1992  
... ... @@ -2004,7 +2004,7 @@
2004 2004 return nla_put(skb, XFRMA_MIGRATE, sizeof(um), &um);
2005 2005 }
2006 2006  
2007   -static int copy_to_user_kmaddress(struct xfrm_kmaddress *k, struct sk_buff *skb)
  2007 +static int copy_to_user_kmaddress(const struct xfrm_kmaddress *k, struct sk_buff *skb)
2008 2008 {
2009 2009 struct xfrm_user_kmaddress uk;
2010 2010  
2011 2011  
... ... @@ -2025,11 +2025,11 @@
2025 2025 + userpolicy_type_attrsize();
2026 2026 }
2027 2027  
2028   -static int build_migrate(struct sk_buff *skb, struct xfrm_migrate *m,
2029   - int num_migrate, struct xfrm_kmaddress *k,
2030   - struct xfrm_selector *sel, u8 dir, u8 type)
  2028 +static int build_migrate(struct sk_buff *skb, const struct xfrm_migrate *m,
  2029 + int num_migrate, const struct xfrm_kmaddress *k,
  2030 + const struct xfrm_selector *sel, u8 dir, u8 type)
2031 2031 {
2032   - struct xfrm_migrate *mp;
  2032 + const struct xfrm_migrate *mp;
2033 2033 struct xfrm_userpolicy_id *pol_id;
2034 2034 struct nlmsghdr *nlh;
2035 2035 int i;
... ... @@ -2061,9 +2061,9 @@
2061 2061 return -EMSGSIZE;
2062 2062 }
2063 2063  
2064   -static int xfrm_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
2065   - struct xfrm_migrate *m, int num_migrate,
2066   - struct xfrm_kmaddress *k)
  2064 +static int xfrm_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
  2065 + const struct xfrm_migrate *m, int num_migrate,
  2066 + const struct xfrm_kmaddress *k)
2067 2067 {
2068 2068 struct net *net = &init_net;
2069 2069 struct sk_buff *skb;
... ... @@ -2079,9 +2079,9 @@
2079 2079 return nlmsg_multicast(net->xfrm.nlsk, skb, 0, XFRMNLGRP_MIGRATE, GFP_ATOMIC);
2080 2080 }
2081 2081 #else
2082   -static int xfrm_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
2083   - struct xfrm_migrate *m, int num_migrate,
2084   - struct xfrm_kmaddress *k)
  2082 +static int xfrm_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
  2083 + const struct xfrm_migrate *m, int num_migrate,
  2084 + const struct xfrm_kmaddress *k)
2085 2085 {
2086 2086 return -ENOPROTOOPT;
2087 2087 }