mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
![Sasha Levin](/assets/img/avatar_default.png)
I'm not sure why, but the hlist for each entry iterators were conceived list_for_each_entry(pos, head, member) The hlist ones were greedy and wanted an extra parameter: hlist_for_each_entry(tpos, pos, head, member) Why did they need an extra pos parameter? I'm not quite sure. Not only they don't really need it, it also prevents the iterator from looking exactly like the list iterator, which is unfortunate. Besides the semantic patch, there was some manual work required: - Fix up the actual hlist iterators in linux/list.h - Fix up the declaration of other iterators based on the hlist ones. - A very small amount of places were using the 'node' parameter, this was modified to use 'obj->member' instead. - Coccinelle didn't handle the hlist_for_each_entry_safe iterator properly, so those had to be fixed up manually. The semantic patch which is mostly the work of Peter Senna Tschudin is here: @@ iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host; type T; expression a,c,d,e; identifier b; statement S; @@ -T b; <+... when != b ( hlist_for_each_entry(a, - b, c, d) S | hlist_for_each_entry_continue(a, - b, c) S | hlist_for_each_entry_from(a, - b, c) S | hlist_for_each_entry_rcu(a, - b, c, d) S | hlist_for_each_entry_rcu_bh(a, - b, c, d) S | hlist_for_each_entry_continue_rcu_bh(a, - b, c) S | for_each_busy_worker(a, c, - b, d) S | ax25_uid_for_each(a, - b, c) S | ax25_for_each(a, - b, c) S | inet_bind_bucket_for_each(a, - b, c) S | sctp_for_each_hentry(a, - b, c) S | sk_for_each(a, - b, c) S | sk_for_each_rcu(a, - b, c) S | sk_for_each_from -(a, b) +(a) S + sk_for_each_from(a) S | sk_for_each_safe(a, - b, c, d) S | sk_for_each_bound(a, - b, c) S | hlist_for_each_entry_safe(a, - b, c, d, e) S | hlist_for_each_entry_continue_rcu(a, - b, c) S | nr_neigh_for_each(a, - b, c) S | nr_neigh_for_each_safe(a, - b, c, d) S | nr_node_for_each(a, - b, c) S | nr_node_for_each_safe(a, - b, c, d) S | - for_each_gfn_sp(a, c, d, b) S + for_each_gfn_sp(a, c, d) S | - for_each_gfn_indirect_valid_sp(a, c, d, b) S + for_each_gfn_indirect_valid_sp(a, c, d) S | for_each_host(a, - b, c) S | for_each_host_safe(a, - b, c, d) S | for_each_mesh_entry(a, - b, c, d) S ) ...+> [akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c] [akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c] [akpm@linux-foundation.org: checkpatch fixes] [akpm@linux-foundation.org: fix warnings] [akpm@linux-foudnation.org: redo intrusive kvm changes] Tested-by: Peter Senna Tschudin <peter.senna@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Cc: Wu Fengguang <fengguang.wu@intel.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Gleb Natapov <gleb@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
208 lines
5 KiB
C
208 lines
5 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
|
|
* Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de)
|
|
*/
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/in.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/string.h>
|
|
#include <linux/sockios.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/net.h>
|
|
#include <linux/gfp.h>
|
|
#include <net/ax25.h>
|
|
#include <linux/inet.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <net/sock.h>
|
|
#include <asm/uaccess.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/interrupt.h>
|
|
|
|
void ax25_ds_nr_error_recovery(ax25_cb *ax25)
|
|
{
|
|
ax25_ds_establish_data_link(ax25);
|
|
}
|
|
|
|
/*
|
|
* dl1bke 960114: transmit I frames on DAMA poll
|
|
*/
|
|
void ax25_ds_enquiry_response(ax25_cb *ax25)
|
|
{
|
|
ax25_cb *ax25o;
|
|
|
|
/* Please note that neither DK4EG's nor DG2FEF's
|
|
* DAMA spec mention the following behaviour as seen
|
|
* with TheFirmware:
|
|
*
|
|
* DB0ACH->DL1BKE <RR C P R0> [DAMA]
|
|
* DL1BKE->DB0ACH <I NR=0 NS=0>
|
|
* DL1BKE-7->DB0PRA-6 DB0ACH <I C S3 R5>
|
|
* DL1BKE->DB0ACH <RR R F R0>
|
|
*
|
|
* The Flexnet DAMA Master implementation apparently
|
|
* insists on the "proper" AX.25 behaviour:
|
|
*
|
|
* DB0ACH->DL1BKE <RR C P R0> [DAMA]
|
|
* DL1BKE->DB0ACH <RR R F R0>
|
|
* DL1BKE->DB0ACH <I NR=0 NS=0>
|
|
* DL1BKE-7->DB0PRA-6 DB0ACH <I C S3 R5>
|
|
*
|
|
* Flexnet refuses to send us *any* I frame if we send
|
|
* a REJ in case AX25_COND_REJECT is set. It is superfluous in
|
|
* this mode anyway (a RR or RNR invokes the retransmission).
|
|
* Is this a Flexnet bug?
|
|
*/
|
|
|
|
ax25_std_enquiry_response(ax25);
|
|
|
|
if (!(ax25->condition & AX25_COND_PEER_RX_BUSY)) {
|
|
ax25_requeue_frames(ax25);
|
|
ax25_kick(ax25);
|
|
}
|
|
|
|
if (ax25->state == AX25_STATE_1 || ax25->state == AX25_STATE_2 || skb_peek(&ax25->ack_queue) != NULL)
|
|
ax25_ds_t1_timeout(ax25);
|
|
else
|
|
ax25->n2count = 0;
|
|
|
|
ax25_start_t3timer(ax25);
|
|
ax25_ds_set_timer(ax25->ax25_dev);
|
|
|
|
spin_lock(&ax25_list_lock);
|
|
ax25_for_each(ax25o, &ax25_list) {
|
|
if (ax25o == ax25)
|
|
continue;
|
|
|
|
if (ax25o->ax25_dev != ax25->ax25_dev)
|
|
continue;
|
|
|
|
if (ax25o->state == AX25_STATE_1 || ax25o->state == AX25_STATE_2) {
|
|
ax25_ds_t1_timeout(ax25o);
|
|
continue;
|
|
}
|
|
|
|
if (!(ax25o->condition & AX25_COND_PEER_RX_BUSY) && ax25o->state == AX25_STATE_3) {
|
|
ax25_requeue_frames(ax25o);
|
|
ax25_kick(ax25o);
|
|
}
|
|
|
|
if (ax25o->state == AX25_STATE_1 || ax25o->state == AX25_STATE_2 || skb_peek(&ax25o->ack_queue) != NULL)
|
|
ax25_ds_t1_timeout(ax25o);
|
|
|
|
/* do not start T3 for listening sockets (tnx DD8NE) */
|
|
|
|
if (ax25o->state != AX25_STATE_0)
|
|
ax25_start_t3timer(ax25o);
|
|
}
|
|
spin_unlock(&ax25_list_lock);
|
|
}
|
|
|
|
void ax25_ds_establish_data_link(ax25_cb *ax25)
|
|
{
|
|
ax25->condition &= AX25_COND_DAMA_MODE;
|
|
ax25->n2count = 0;
|
|
ax25_calculate_t1(ax25);
|
|
ax25_start_t1timer(ax25);
|
|
ax25_stop_t2timer(ax25);
|
|
ax25_start_t3timer(ax25);
|
|
}
|
|
|
|
/*
|
|
* :::FIXME:::
|
|
* This is a kludge. Not all drivers recognize kiss commands.
|
|
* We need a driver level request to switch duplex mode, that does
|
|
* either SCC changing, PI config or KISS as required. Currently
|
|
* this request isn't reliable.
|
|
*/
|
|
static void ax25_kiss_cmd(ax25_dev *ax25_dev, unsigned char cmd, unsigned char param)
|
|
{
|
|
struct sk_buff *skb;
|
|
unsigned char *p;
|
|
|
|
if (ax25_dev->dev == NULL)
|
|
return;
|
|
|
|
if ((skb = alloc_skb(2, GFP_ATOMIC)) == NULL)
|
|
return;
|
|
|
|
skb_reset_network_header(skb);
|
|
p = skb_put(skb, 2);
|
|
|
|
*p++ = cmd;
|
|
*p++ = param;
|
|
|
|
skb->protocol = ax25_type_trans(skb, ax25_dev->dev);
|
|
|
|
dev_queue_xmit(skb);
|
|
}
|
|
|
|
/*
|
|
* A nasty problem arises if we count the number of DAMA connections
|
|
* wrong, especially when connections on the device already existed
|
|
* and our network node (or the sysop) decides to turn on DAMA Master
|
|
* mode. We thus flag the 'real' slave connections with
|
|
* ax25->dama_slave=1 and look on every disconnect if still slave
|
|
* connections exist.
|
|
*/
|
|
static int ax25_check_dama_slave(ax25_dev *ax25_dev)
|
|
{
|
|
ax25_cb *ax25;
|
|
int res = 0;
|
|
|
|
spin_lock(&ax25_list_lock);
|
|
ax25_for_each(ax25, &ax25_list)
|
|
if (ax25->ax25_dev == ax25_dev && (ax25->condition & AX25_COND_DAMA_MODE) && ax25->state > AX25_STATE_1) {
|
|
res = 1;
|
|
break;
|
|
}
|
|
spin_unlock(&ax25_list_lock);
|
|
|
|
return res;
|
|
}
|
|
|
|
static void ax25_dev_dama_on(ax25_dev *ax25_dev)
|
|
{
|
|
if (ax25_dev == NULL)
|
|
return;
|
|
|
|
if (ax25_dev->dama.slave == 0)
|
|
ax25_kiss_cmd(ax25_dev, 5, 1);
|
|
|
|
ax25_dev->dama.slave = 1;
|
|
ax25_ds_set_timer(ax25_dev);
|
|
}
|
|
|
|
void ax25_dev_dama_off(ax25_dev *ax25_dev)
|
|
{
|
|
if (ax25_dev == NULL)
|
|
return;
|
|
|
|
if (ax25_dev->dama.slave && !ax25_check_dama_slave(ax25_dev)) {
|
|
ax25_kiss_cmd(ax25_dev, 5, 0);
|
|
ax25_dev->dama.slave = 0;
|
|
ax25_ds_del_timer(ax25_dev);
|
|
}
|
|
}
|
|
|
|
void ax25_dama_on(ax25_cb *ax25)
|
|
{
|
|
ax25_dev_dama_on(ax25->ax25_dev);
|
|
ax25->condition |= AX25_COND_DAMA_MODE;
|
|
}
|
|
|
|
void ax25_dama_off(ax25_cb *ax25)
|
|
{
|
|
ax25->condition &= ~AX25_COND_DAMA_MODE;
|
|
ax25_dev_dama_off(ax25->ax25_dev);
|
|
}
|
|
|