mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
Merge branch 'make-use-of-the-helper-macro-list_head'
Hongbo Li says: ==================== make use of the helper macro LIST_HEAD() The macro LIST_HEAD() declares a list variable and initializes it, which can be used to simplify the steps of list initialization, thereby simplifying the code. These serials just do some equivalatent substitutions, and with no functional modifications. ==================== Link: https://patch.msgid.link/20240904093243.3345012-1-lihongbo22@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
7ab50d5e88
@ -5727,10 +5727,9 @@ static void __netif_receive_skb_list_core(struct list_head *head, bool pfmemallo
|
||||
struct packet_type *pt_curr = NULL;
|
||||
/* Current (common) orig_dev of sublist */
|
||||
struct net_device *od_curr = NULL;
|
||||
struct list_head sublist;
|
||||
struct sk_buff *skb, *next;
|
||||
LIST_HEAD(sublist);
|
||||
|
||||
INIT_LIST_HEAD(&sublist);
|
||||
list_for_each_entry_safe(skb, next, head, list) {
|
||||
struct net_device *orig_dev = skb->dev;
|
||||
struct packet_type *pt_prev = NULL;
|
||||
@ -5868,9 +5867,8 @@ static int netif_receive_skb_internal(struct sk_buff *skb)
|
||||
void netif_receive_skb_list_internal(struct list_head *head)
|
||||
{
|
||||
struct sk_buff *skb, *next;
|
||||
struct list_head sublist;
|
||||
LIST_HEAD(sublist);
|
||||
|
||||
INIT_LIST_HEAD(&sublist);
|
||||
list_for_each_entry_safe(skb, next, head, list) {
|
||||
net_timestamp_check(READ_ONCE(net_hotdata.tstamp_prequeue),
|
||||
skb);
|
||||
|
@ -596,9 +596,8 @@ static void ip_list_rcv_finish(struct net *net, struct sock *sk,
|
||||
{
|
||||
struct sk_buff *skb, *next, *hint = NULL;
|
||||
struct dst_entry *curr_dst = NULL;
|
||||
struct list_head sublist;
|
||||
LIST_HEAD(sublist);
|
||||
|
||||
INIT_LIST_HEAD(&sublist);
|
||||
list_for_each_entry_safe(skb, next, head, list) {
|
||||
struct net_device *dev = skb->dev;
|
||||
struct dst_entry *dst;
|
||||
@ -646,9 +645,8 @@ void ip_list_rcv(struct list_head *head, struct packet_type *pt,
|
||||
struct net_device *curr_dev = NULL;
|
||||
struct net *curr_net = NULL;
|
||||
struct sk_buff *skb, *next;
|
||||
struct list_head sublist;
|
||||
LIST_HEAD(sublist);
|
||||
|
||||
INIT_LIST_HEAD(&sublist);
|
||||
list_for_each_entry_safe(skb, next, head, list) {
|
||||
struct net_device *dev = skb->dev;
|
||||
struct net *net = dev_net(dev);
|
||||
|
@ -111,9 +111,8 @@ static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
|
||||
{
|
||||
struct sk_buff *skb, *next, *hint = NULL;
|
||||
struct dst_entry *curr_dst = NULL;
|
||||
struct list_head sublist;
|
||||
LIST_HEAD(sublist);
|
||||
|
||||
INIT_LIST_HEAD(&sublist);
|
||||
list_for_each_entry_safe(skb, next, head, list) {
|
||||
struct dst_entry *dst;
|
||||
|
||||
@ -327,9 +326,8 @@ void ipv6_list_rcv(struct list_head *head, struct packet_type *pt,
|
||||
struct net_device *curr_dev = NULL;
|
||||
struct net *curr_net = NULL;
|
||||
struct sk_buff *skb, *next;
|
||||
struct list_head sublist;
|
||||
LIST_HEAD(sublist);
|
||||
|
||||
INIT_LIST_HEAD(&sublist);
|
||||
list_for_each_entry_safe(skb, next, head, list) {
|
||||
struct net_device *dev = skb->dev;
|
||||
struct net *net = dev_net(dev);
|
||||
|
@ -655,11 +655,9 @@ void nf_hook_slow_list(struct list_head *head, struct nf_hook_state *state,
|
||||
const struct nf_hook_entries *e)
|
||||
{
|
||||
struct sk_buff *skb, *next;
|
||||
struct list_head sublist;
|
||||
LIST_HEAD(sublist);
|
||||
int ret;
|
||||
|
||||
INIT_LIST_HEAD(&sublist);
|
||||
|
||||
list_for_each_entry_safe(skb, next, head, list) {
|
||||
skb_list_del_init(skb);
|
||||
ret = nf_hook_slow(skb, state, e, 0);
|
||||
|
@ -1009,12 +1009,11 @@ static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
|
||||
struct tipc_member *mbr = NULL;
|
||||
struct net *net = sock_net(sk);
|
||||
u32 node, port, exclude;
|
||||
struct list_head dsts;
|
||||
LIST_HEAD(dsts);
|
||||
int lookups = 0;
|
||||
int dstcnt, rc;
|
||||
bool cong;
|
||||
|
||||
INIT_LIST_HEAD(&dsts);
|
||||
ua->sa.type = msg_nametype(hdr);
|
||||
ua->scope = msg_lookup_scope(hdr);
|
||||
|
||||
@ -1161,10 +1160,9 @@ static int tipc_send_group_mcast(struct socket *sock, struct msghdr *m,
|
||||
struct tipc_group *grp = tsk->group;
|
||||
struct tipc_msg *hdr = &tsk->phdr;
|
||||
struct net *net = sock_net(sk);
|
||||
struct list_head dsts;
|
||||
u32 dstcnt, exclude;
|
||||
LIST_HEAD(dsts);
|
||||
|
||||
INIT_LIST_HEAD(&dsts);
|
||||
ua->sa.type = msg_nametype(hdr);
|
||||
ua->scope = msg_lookup_scope(hdr);
|
||||
exclude = tipc_group_exclude(grp);
|
||||
|
Loading…
Reference in New Issue
Block a user