batman-adv: compat: add the case if dev is NULL
Sven Eckelmann
maintainerPATCH 1/2 batman-adv: compat: add the case if dev is NULL
From: Yajun Deng <[email protected]>
Add the case if dev is NULL in dev_{put, hold}, so the caller doesn't need to care whether dev is NULL or not.
Signed-off-by Yajun Deng <[email protected]>
Signed-off-by David S. Miller <[email protected]>
[[email protected]: Convert to compat code]
Signed-off-by Sven Eckelmann <[email protected]>
--- compat-include/linux/netdevice.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
compat-include/linux/netdevice.h +23 -0
@@ -67,4 +67,27 @@ static inline int batadv_netif_rx_any_context(struct sk_buff *skb)#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */ + +#if LINUX_VERSION_IS_LESS (5 ,15 ,0 ) + +static inline void batadv_dev_put (struct net_device *dev) +{ +if (!dev) +return ; + +dev_put (dev); +} +#define dev_put batadv_dev_put + +static inline void batadv_dev_hold (struct net_device *dev) +{ +if (!dev) +return ; + +dev_hold (dev); +} +#define dev_hold batadv_dev_hold + +#endif /* LINUX_VERSION_IS_LESS(5, 15, 0) */ +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */
Signature · 1 line
2.30.2
Sven Eckelmann
maintainerPATCH 2/2 batman-adv: Remove redundant if statements
From: Yajun Deng <[email protected]>
The 'if (dev)' statement already move into dev_{put , hold}, so remove redundant if statements.
Signed-off-by Yajun Deng <[email protected]>
Signed-off-by David S. Miller <[email protected]>
--- net/batman-adv/bridge_loop_avoidance.c | 6 ++---- net/batman-adv/distributed-arp-table.c | 3 +-- net/batman-adv/gateway_client.c | 3 +-- net/batman-adv/multicast.c | 9 +++------ net/batman-adv/originator.c | 12 ++++-------- net/batman-adv/translation-table.c | 9 +++------ 6 files changed, 14 insertions(+), 28 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +2 -4
@@ -2274,8 +2274,7 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb)if (primary_if)batadv_hardif_put (primary_if); -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface);return ret; }
@@ -2446,8 +2445,7 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb)if (primary_if)batadv_hardif_put (primary_if); -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface);return ret; }
net/batman-adv/distributed-arp-table.c +1 -2
@@ -984,8 +984,7 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)if (primary_if)batadv_hardif_put (primary_if); -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface);return ret; }
net/batman-adv/gateway_client.c +1 -2
@@ -557,8 +557,7 @@ int batadv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb) out:if (primary_if)batadv_hardif_put (primary_if); -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface);return ret; }
net/batman-adv/multicast.c +3 -6
@@ -91,8 +91,7 @@ static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface) upper =netdev_master_upper_dev_get_rcu (upper); }while (upper && !(upper->priv_flags &IFF_EBRIDGE )); -if (upper) -dev_hold (upper); +dev_hold (upper);rcu_read_unlock ();return upper;
@@ -509,8 +508,7 @@ batadv_mcast_mla_softif_get(struct net_device *dev, } out: -if (bridge) -dev_put (bridge); +dev_put (bridge);return ret4 + ret6; }
@@ -2239,8 +2237,7 @@ batadv_mcast_netlink_get_primary(struct netlink_callback *cb, } out: -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface);if (!ret && primary_if) *primary_if = hard_iface;
net/batman-adv/originator.c +4 -8
@@ -799,12 +799,10 @@ int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb) out:if (hardif)batadv_hardif_put (hardif); -if (hard_iface) -dev_put (hard_iface); +dev_put (hard_iface);if (primary_if)batadv_hardif_put (primary_if); -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface);return ret; }
@@ -1412,12 +1410,10 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb) out:if (hardif)batadv_hardif_put (hardif); -if (hard_iface) -dev_put (hard_iface); +dev_put (hard_iface);if (primary_if)batadv_hardif_put (primary_if); -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface);return ret; }
net/batman-adv/translation-table.c +3 -6
@@ -820,8 +820,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, out:if (in_hardif)batadv_hardif_put (in_hardif); -if (in_dev) -dev_put (in_dev); +dev_put (in_dev);if (tt_local)batadv_tt_local_entry_put (tt_local);if (tt_global)
@@ -1217,8 +1216,7 @@ int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb) out:if (primary_if)batadv_hardif_put (primary_if); -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface); cb->args[0 ] = bucket; cb->args[1 ] = idx;
@@ -2005,8 +2003,7 @@ int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb) out:if (primary_if)batadv_hardif_put (primary_if); -if (soft_iface) -dev_put (soft_iface); +dev_put (soft_iface); cb->args[0 ] = bucket; cb->args[1 ] = idx;
Signature · 1 line
2.30.2