2022-04-28 05:14:24

by Alexander Aring

Subject: [PATCH bluetooth-next 3/3] net: 6lowpan: constify lowpan_nhc structures

This patch constify the lowpan_nhc declarations. Since we drop the rb
node datastructure there is no need for runtime manipulation of this
structure.

Signed-off-by: Alexander Aring <[email protected]>
---
net/6lowpan/nhc.c | 16 ++++++++--------
net/6lowpan/nhc.h | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/net/6lowpan/nhc.c b/net/6lowpan/nhc.c
index 019f121b2449..7b374595328d 100644
--- a/net/6lowpan/nhc.c
+++ b/net/6lowpan/nhc.c
@@ -12,12 +12,12 @@

#include "nhc.h"

-static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX + 1];
+static const struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX + 1];
static DEFINE_SPINLOCK(lowpan_nhc_lock);

-static struct lowpan_nhc *lowpan_nhc_by_nhcid(struct sk_buff *skb)
+static const struct lowpan_nhc *lowpan_nhc_by_nhcid(struct sk_buff *skb)
{
- struct lowpan_nhc *nhc;
+ const struct lowpan_nhc *nhc;
int i;
u8 id;

@@ -41,7 +41,7 @@ static struct lowpan_nhc *lowpan_nhc_by_nhcid(struct sk_buff *skb)
int lowpan_nhc_check_compression(struct sk_buff *skb,
const struct ipv6hdr *hdr, u8 **hc_ptr)
{
- struct lowpan_nhc *nhc;
+ const struct lowpan_nhc *nhc;
int ret = 0;

spin_lock_bh(&lowpan_nhc_lock);
@@ -59,7 +59,7 @@ int lowpan_nhc_do_compression(struct sk_buff *skb, const struct ipv6hdr *hdr,
u8 **hc_ptr)
{
int ret;
- struct lowpan_nhc *nhc;
+ const struct lowpan_nhc *nhc;

spin_lock_bh(&lowpan_nhc_lock);

@@ -102,7 +102,7 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,
const struct net_device *dev,
struct ipv6hdr *hdr)
{
- struct lowpan_nhc *nhc;
+ const struct lowpan_nhc *nhc;
int ret;

spin_lock_bh(&lowpan_nhc_lock);
@@ -138,7 +138,7 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,
return 0;
}

-int lowpan_nhc_add(struct lowpan_nhc *nhc)
+int lowpan_nhc_add(const struct lowpan_nhc *nhc)
{
int ret = 0;

@@ -156,7 +156,7 @@ int lowpan_nhc_add(struct lowpan_nhc *nhc)
}
EXPORT_SYMBOL(lowpan_nhc_add);

-void lowpan_nhc_del(struct lowpan_nhc *nhc)
+void lowpan_nhc_del(const struct lowpan_nhc *nhc)
{
spin_lock_bh(&lowpan_nhc_lock);

diff --git a/net/6lowpan/nhc.h b/net/6lowpan/nhc.h
index 9df602a632bd..ab7b4977c32b 100644
--- a/net/6lowpan/nhc.h
+++ b/net/6lowpan/nhc.h
@@ -24,7 +24,7 @@
#define LOWPAN_NHC(__nhc, _name, _nexthdr, \
_hdrlen, _id, _idmask, \
_uncompress, _compress) \
-static struct lowpan_nhc __nhc = { \
+static const struct lowpan_nhc __nhc = { \
.name = _name, \
.nexthdr = _nexthdr, \
.nexthdrlen = _hdrlen, \
@@ -116,14 +116,14 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,
*
* @nhc: nhc which should be add.
*/
-int lowpan_nhc_add(struct lowpan_nhc *nhc);
+int lowpan_nhc_add(const struct lowpan_nhc *nhc);

/**
* lowpan_nhc_del - delete a next header compression from framework
*
* @nhc: nhc which should be delete.
*/
-void lowpan_nhc_del(struct lowpan_nhc *nhc);
+void lowpan_nhc_del(const struct lowpan_nhc *nhc);

/**
* lowpan_nhc_init - adding all default nhcs
--
2.31.1

2022-05-02 23:29:19

by Stefan Schmidt

Subject: Re: [PATCH bluetooth-next 3/3] net: 6lowpan: constify lowpan_nhc structures

Hello.

On 28.04.22 05:05, Alexander Aring wrote:
> This patch constify the lowpan_nhc declarations. Since we drop the rb
> node datastructure there is no need for runtime manipulation of this
> structure.
>
> Signed-off-by: Alexander Aring <[email protected]>
> ---
> net/6lowpan/nhc.c | 16 ++++++++--------
> net/6lowpan/nhc.h | 6 +++---
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/net/6lowpan/nhc.c b/net/6lowpan/nhc.c
> index 019f121b2449..7b374595328d 100644
> --- a/net/6lowpan/nhc.c
> +++ b/net/6lowpan/nhc.c
> @@ -12,12 +12,12 @@
>
> #include "nhc.h"
>
> -static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX + 1];
> +static const struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX + 1];
> static DEFINE_SPINLOCK(lowpan_nhc_lock);
>
> -static struct lowpan_nhc *lowpan_nhc_by_nhcid(struct sk_buff *skb)
> +static const struct lowpan_nhc *lowpan_nhc_by_nhcid(struct sk_buff *skb)
> {
> - struct lowpan_nhc *nhc;
> + const struct lowpan_nhc *nhc;
> int i;
> u8 id;
>
> @@ -41,7 +41,7 @@ static struct lowpan_nhc *lowpan_nhc_by_nhcid(struct sk_buff *skb)
> int lowpan_nhc_check_compression(struct sk_buff *skb,
> const struct ipv6hdr *hdr, u8 **hc_ptr)
> {
> - struct lowpan_nhc *nhc;
> + const struct lowpan_nhc *nhc;
> int ret = 0;
>
> spin_lock_bh(&lowpan_nhc_lock);
> @@ -59,7 +59,7 @@ int lowpan_nhc_do_compression(struct sk_buff *skb, const struct ipv6hdr *hdr,
> u8 **hc_ptr)
> {
> int ret;
> - struct lowpan_nhc *nhc;
> + const struct lowpan_nhc *nhc;
>
> spin_lock_bh(&lowpan_nhc_lock);
>
> @@ -102,7 +102,7 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,
> const struct net_device *dev,
> struct ipv6hdr *hdr)
> {
> - struct lowpan_nhc *nhc;
> + const struct lowpan_nhc *nhc;
> int ret;
>
> spin_lock_bh(&lowpan_nhc_lock);
> @@ -138,7 +138,7 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,
> return 0;
> }
>
> -int lowpan_nhc_add(struct lowpan_nhc *nhc)
> +int lowpan_nhc_add(const struct lowpan_nhc *nhc)
> {
> int ret = 0;
>
> @@ -156,7 +156,7 @@ int lowpan_nhc_add(struct lowpan_nhc *nhc)
> }
> EXPORT_SYMBOL(lowpan_nhc_add);
>
> -void lowpan_nhc_del(struct lowpan_nhc *nhc)
> +void lowpan_nhc_del(const struct lowpan_nhc *nhc)
> {
> spin_lock_bh(&lowpan_nhc_lock);
>
> diff --git a/net/6lowpan/nhc.h b/net/6lowpan/nhc.h
> index 9df602a632bd..ab7b4977c32b 100644
> --- a/net/6lowpan/nhc.h
> +++ b/net/6lowpan/nhc.h
> @@ -24,7 +24,7 @@
> #define LOWPAN_NHC(__nhc, _name, _nexthdr, \
> _hdrlen, _id, _idmask, \
> _uncompress, _compress) \
> -static struct lowpan_nhc __nhc = { \
> +static const struct lowpan_nhc __nhc = { \
> .name = _name, \
> .nexthdr = _nexthdr, \
> .nexthdrlen = _hdrlen, \
> @@ -116,14 +116,14 @@ int lowpan_nhc_do_uncompression(struct sk_buff *skb,
> *
> * @nhc: nhc which should be add.
> */
> -int lowpan_nhc_add(struct lowpan_nhc *nhc);
> +int lowpan_nhc_add(const struct lowpan_nhc *nhc);
>
> /**
> * lowpan_nhc_del - delete a next header compression from framework
> *
> * @nhc: nhc which should be delete.
> */
> -void lowpan_nhc_del(struct lowpan_nhc *nhc);
> +void lowpan_nhc_del(const struct lowpan_nhc *nhc);
>
> /**
> * lowpan_nhc_init - adding all default nhcs

Reviewed-by: Stefan Schmidt <[email protected]>

regards
Stefan Schmidt

2022-05-03 09:36:21

by Jukka Rissanen

Subject: Re: [PATCH bluetooth-next 3/3] net: 6lowpan: constify lowpan_nhc structures

On Wed, 2022-04-27 at 23:05 -0400, Alexander Aring wrote:
> This patch constify the lowpan_nhc declarations. Since we drop the rb
> node datastructure there is no need for runtime manipulation of this
> structure.
>
> Signed-off-by: Alexander Aring <[email protected]>
> ---
>  net/6lowpan/nhc.c | 16 ++++++++--------
>  net/6lowpan/nhc.h |  6 +++---
>  2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/net/6lowpan/nhc.c b/net/6lowpan/nhc.c
> index 019f121b2449..7b374595328d 100644
> --- a/net/6lowpan/nhc.c
> +++ b/net/6lowpan/nhc.c
> @@ -12,12 +12,12 @@
>


Acked-by: Jukka Rissanen <[email protected]>


Cheers,
Jukka