pull request for net-next: batman-adv 2022-05-08
Subsystems (3)
Simon Wunderlich
maintainercover pull request for net-next: batman-adv 2022-05-08
Hi Jakub, hi David,
here is a very little cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 3123109284176b1532874591f7c81f3837bbdc17:
Linux 5.18-rc1 (2022-04-03 14:08:21 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20220508
for you to fetch changes up to 8864d2fcf04385cabb8c8bb159f1f2ba5790cf71:
batman-adv: remove unnecessary type castings (2022-04-22 11:23:46 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- remove unnecessary type castings, by Yu Zhe
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: Start new development cycle
Yu Zhe (1):
batman-adv: remove unnecessary type castings
net/batman-adv/bridge_loop_avoidance.c | 4 ++-- net/batman-adv/main.h | 2 +- net/batman-adv/translation-table.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-)
Simon Wunderlich
maintainerPATCH 1/2 batman-adv: Start new development cycle
This version will contain all the (major or even only minor) changes for Linux 5.19.
The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0).
--- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/main.h +1 -1
@@ -13,7 +13,7 @@#define BATADV_DRIVER_DEVICE "batman-adv"#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2022.1" +#define BATADV_SOURCE_VERSION "2022.2"#endif /* B.A.T.M.A.N. parameters */
Signature · 1 line
2.30.2
Re: [PATCH 1/2] batman-adv: Start new development cycle
Quoted 17 lines · Simon Wunderlich
This version will contain all the (major or even only minor) changes for Linux 5.19.
The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0).
Signed-off-by Simon Wunderlich <[email protected]>--- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/batman-adv/main.h +0
-0
net/batman-adv/main.h line 16
Quoted 5 lines
net/batman-adv/main.h +1
-1@@ -13,7 +13,7 @@#define BATADV_DRIVER_DEVICE "batman-adv"#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2022.1" +#define BATADV_SOURCE_VERSION "2022.2"
It is so not kernel-style. I recommend to drop this patch.
Thanks
Quoted 6 lines
net/batman-adv/main.h +0
-0#endif /* B.A.T.M.A.N. parameters */ Signature · 1 line
2.30.2
Re: [PATCH 1/2] batman-adv: Start new development cycle
In reply to Simon WunderlichThis series was applied to netdev/net-next.git (master) by Simon Wunderlich <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Simon Wunderlich <[email protected]>:
Quoted 8 lines · On Sun, 8 May 2022 15:26:15 +0200 you wrote:
This version will contain all the (major or even only minor) changes for Linux 5.19.
The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0).
[...]
Here is the summary with links:
- [1/2] batman-adv: Start new development cycle
https://git.kernel.org/netdev/net-next/c/cfa4e7b1bcf8 - [2/2] batman-adv: remove unnecessary type castings https://git.kernel.org/netdev/net-next/c/8864d2fcf043
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Simon Wunderlich
maintainerPATCH 2/2 batman-adv: remove unnecessary type castings
In reply to Simon WunderlichFrom: Yu Zhe <[email protected]>
remove unnecessary void* type castings.
--- net/batman-adv/bridge_loop_avoidance.c | 4 ++-- net/batman-adv/translation-table.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +2 -2
@@ -65,7 +65,7 @@ batadv_bla_send_announce(struct batadv_priv *bat_priv,*/ static inline u32 batadv_choose_claim (const void *data,u32 size) { -struct batadv_bla_claim *claim = (struct batadv_bla_claim *)data; +const struct batadv_bla_claim *claim = data;u32 hash =0 ; hash =jhash (&claim->addr,sizeof (claim->addr), hash);
@@ -86,7 +86,7 @@ static inline u32 batadv_choose_backbone_gw(const void *data, u32 size)const struct batadv_bla_backbone_gw *gw;u32 hash =0 ; - gw = (struct batadv_bla_backbone_gw *)data; + gw = data; hash =jhash (&gw->orig,sizeof (gw->orig), hash); hash =jhash (&gw->vid,sizeof (gw->vid), hash);
net/batman-adv/translation-table.c +6 -6
@@ -103,10 +103,10 @@ static bool batadv_compare_tt(const struct hlist_node *node, const void *data2)*/ static inline u32 batadv_choose_tt (const void *data,u32 size) { -struct batadv_tt_common_entry *tt; +const struct batadv_tt_common_entry *tt;u32 hash =0 ; - tt = (struct batadv_tt_common_entry *)data; + tt = data; hash =jhash (&tt->addr,ETH_ALEN , hash); hash =jhash (&tt->vid,sizeof (tt->vid), hash);
@@ -2766,7 +2766,7 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv,u32 i; tt_tot =batadv_tt_entries (tt_len); - tt_change = (struct batadv_tvlv_tt_change *)tvlv_buff; + tt_change = tvlv_buff;if (!valid_cb)return ;
@@ -3994,7 +3994,7 @@ static void batadv_tt_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,if (tvlv_value_len <sizeof (*tt_data))return ; - tt_data = (struct batadv_tvlv_tt_data *)tvlv_value; + tt_data = tvlv_value; tvlv_value_len -=sizeof (*tt_data); num_vlan =ntohs (tt_data->num_vlan);
@@ -4037,7 +4037,7 @@ static int batadv_tt_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,if (tvlv_value_len <sizeof (*tt_data))return NET_RX_SUCCESS ; - tt_data = (struct batadv_tvlv_tt_data *)tvlv_value; + tt_data = tvlv_value; tvlv_value_len -=sizeof (*tt_data); tt_vlan_len =sizeof (struct batadv_tvlv_tt_vlan_data );
@@ -4129,7 +4129,7 @@ static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv, goto out;batadv_inc_counter (bat_priv,BATADV_CNT_TT_ROAM_ADV_RX ); - roaming_adv = (struct batadv_tvlv_roam_adv *)tvlv_value; + roaming_adv = tvlv_value; batadv_dbg(BATADV_DBG_TT, bat_priv, "Received ROAMING_ADV from %pM (client %pM)\n",
Signature · 1 line
2.30.2
David Miller
maintainerPatch #2 is a cleanup and therefore not appropriate for 'net'.
Thank you.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Sun, 08 May 2022 17:09:08 +0100 (BST)
Quoted 2 lines
Patch #2 is a cleanup and therefore not appropriate for 'net'.
Sorry I'm mixing up the two pull requests you sent, all is fine.
Thanks.