mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 16:12:02 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
349 lines
7.7 KiB
C
349 lines
7.7 KiB
C
/*
|
|
* Callbacks for the FSM
|
|
*
|
|
* Copyright (C) 1996 Universidade de Lisboa
|
|
*
|
|
* Written by Pedro Roque Marques (roque@di.fc.ul.pt)
|
|
*
|
|
* This software may be used and distributed according to the terms of
|
|
* the GNU General Public License, incorporated herein by reference.
|
|
*/
|
|
|
|
/*
|
|
* Fix: 19981230 - Carlos Morgado <chbm@techie.com>
|
|
* Port of Nelson Escravana's <nelson.escravana@usa.net> fix to CalledPN
|
|
* NULL pointer dereference in cb_in_1 (originally fixed in 2.0)
|
|
*/
|
|
|
|
#include <linux/string.h>
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <asm/io.h>
|
|
|
|
#include <linux/isdnif.h>
|
|
|
|
#include "pcbit.h"
|
|
#include "layer2.h"
|
|
#include "edss1.h"
|
|
#include "callbacks.h"
|
|
#include "capi.h"
|
|
|
|
ushort last_ref_num = 1;
|
|
|
|
/*
|
|
* send_conn_req
|
|
*
|
|
*/
|
|
|
|
void cb_out_1(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *cbdata)
|
|
{
|
|
struct sk_buff *skb;
|
|
int len;
|
|
ushort refnum;
|
|
|
|
|
|
#ifdef DEBUG
|
|
printk(KERN_DEBUG "Called Party Number: %s\n",
|
|
cbdata->data.setup.CalledPN);
|
|
#endif
|
|
/*
|
|
* hdr - kmalloc in capi_conn_req
|
|
* - kfree when msg has been sent
|
|
*/
|
|
|
|
if ((len = capi_conn_req(cbdata->data.setup.CalledPN, &skb,
|
|
chan->proto)) < 0)
|
|
{
|
|
printk("capi_conn_req failed\n");
|
|
return;
|
|
}
|
|
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
|
|
chan->callref = 0;
|
|
chan->layer2link = 0;
|
|
chan->snum = 0;
|
|
chan->s_refnum = refnum;
|
|
|
|
pcbit_l2_write(dev, MSG_CONN_REQ, refnum, skb, len);
|
|
}
|
|
|
|
/*
|
|
* rcv CONNECT
|
|
* will go into ACTIVE state
|
|
* send CONN_ACTIVE_RESP
|
|
* send Select protocol request
|
|
*/
|
|
|
|
void cb_out_2(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
isdn_ctrl ictl;
|
|
struct sk_buff *skb;
|
|
int len;
|
|
ushort refnum;
|
|
|
|
if ((len=capi_conn_active_resp(chan, &skb)) < 0)
|
|
{
|
|
printk("capi_conn_active_req failed\n");
|
|
return;
|
|
}
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
chan->s_refnum = refnum;
|
|
|
|
pcbit_l2_write(dev, MSG_CONN_ACTV_RESP, refnum, skb, len);
|
|
|
|
|
|
ictl.command = ISDN_STAT_DCONN;
|
|
ictl.driver=dev->id;
|
|
ictl.arg=chan->id;
|
|
dev->dev_if->statcallb(&ictl);
|
|
|
|
/* ACTIVE D-channel */
|
|
|
|
/* Select protocol */
|
|
|
|
if ((len=capi_select_proto_req(chan, &skb, 1 /*outgoing*/)) < 0) {
|
|
printk("capi_select_proto_req failed\n");
|
|
return;
|
|
}
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
chan->s_refnum = refnum;
|
|
|
|
pcbit_l2_write(dev, MSG_SELP_REQ, refnum, skb, len);
|
|
}
|
|
|
|
|
|
/*
|
|
* Incoming call received
|
|
* inform user
|
|
*/
|
|
|
|
void cb_in_1(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *cbdata)
|
|
{
|
|
isdn_ctrl ictl;
|
|
unsigned short refnum;
|
|
struct sk_buff *skb;
|
|
int len;
|
|
|
|
|
|
ictl.command = ISDN_STAT_ICALL;
|
|
ictl.driver=dev->id;
|
|
ictl.arg=chan->id;
|
|
|
|
/*
|
|
* ictl.num >= strlen() + strlen() + 5
|
|
*/
|
|
|
|
if (cbdata->data.setup.CallingPN == NULL) {
|
|
printk(KERN_DEBUG "NULL CallingPN to phone; using 0\n");
|
|
strcpy(ictl.parm.setup.phone, "0");
|
|
}
|
|
else {
|
|
strcpy(ictl.parm.setup.phone, cbdata->data.setup.CallingPN);
|
|
}
|
|
if (cbdata->data.setup.CalledPN == NULL) {
|
|
printk(KERN_DEBUG "NULL CalledPN to eazmsn; using 0\n");
|
|
strcpy(ictl.parm.setup.eazmsn, "0");
|
|
}
|
|
else {
|
|
strcpy(ictl.parm.setup.eazmsn, cbdata->data.setup.CalledPN);
|
|
}
|
|
ictl.parm.setup.si1 = 7;
|
|
ictl.parm.setup.si2 = 0;
|
|
ictl.parm.setup.plan = 0;
|
|
ictl.parm.setup.screen = 0;
|
|
|
|
#ifdef DEBUG
|
|
printk(KERN_DEBUG "statstr: %s\n", ictl.num);
|
|
#endif
|
|
|
|
dev->dev_if->statcallb(&ictl);
|
|
|
|
|
|
if ((len=capi_conn_resp(chan, &skb)) < 0) {
|
|
printk(KERN_DEBUG "capi_conn_resp failed\n");
|
|
return;
|
|
}
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
chan->s_refnum = refnum;
|
|
|
|
pcbit_l2_write(dev, MSG_CONN_RESP, refnum, skb, len);
|
|
}
|
|
|
|
/*
|
|
* user has replied
|
|
* open the channel
|
|
* send CONNECT message CONNECT_ACTIVE_REQ in CAPI
|
|
*/
|
|
|
|
void cb_in_2(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
unsigned short refnum;
|
|
struct sk_buff *skb;
|
|
int len;
|
|
|
|
if ((len = capi_conn_active_req(chan, &skb)) < 0) {
|
|
printk(KERN_DEBUG "capi_conn_active_req failed\n");
|
|
return;
|
|
}
|
|
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
chan->s_refnum = refnum;
|
|
|
|
printk(KERN_DEBUG "sending MSG_CONN_ACTV_REQ\n");
|
|
pcbit_l2_write(dev, MSG_CONN_ACTV_REQ, refnum, skb, len);
|
|
}
|
|
|
|
/*
|
|
* CONN_ACK arrived
|
|
* start b-proto selection
|
|
*
|
|
*/
|
|
|
|
void cb_in_3(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
unsigned short refnum;
|
|
struct sk_buff *skb;
|
|
int len;
|
|
|
|
if ((len = capi_select_proto_req(chan, &skb, 0 /*incoming*/)) < 0)
|
|
{
|
|
printk("capi_select_proto_req failed\n");
|
|
return;
|
|
}
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
chan->s_refnum = refnum;
|
|
|
|
pcbit_l2_write(dev, MSG_SELP_REQ, refnum, skb, len);
|
|
|
|
}
|
|
|
|
|
|
/*
|
|
* Received disconnect ind on active state
|
|
* send disconnect resp
|
|
* send msg to user
|
|
*/
|
|
void cb_disc_1(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
struct sk_buff *skb;
|
|
int len;
|
|
ushort refnum;
|
|
isdn_ctrl ictl;
|
|
|
|
if ((len = capi_disc_resp(chan, &skb)) < 0) {
|
|
printk("capi_disc_resp failed\n");
|
|
return;
|
|
}
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
chan->s_refnum = refnum;
|
|
|
|
pcbit_l2_write(dev, MSG_DISC_RESP, refnum, skb, len);
|
|
|
|
ictl.command = ISDN_STAT_BHUP;
|
|
ictl.driver=dev->id;
|
|
ictl.arg=chan->id;
|
|
dev->dev_if->statcallb(&ictl);
|
|
}
|
|
|
|
|
|
/*
|
|
* User HANGUP on active/call proceeding state
|
|
* send disc.req
|
|
*/
|
|
void cb_disc_2(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
struct sk_buff *skb;
|
|
int len;
|
|
ushort refnum;
|
|
|
|
if ((len = capi_disc_req(chan->callref, &skb, CAUSE_NORMAL)) < 0)
|
|
{
|
|
printk("capi_disc_req failed\n");
|
|
return;
|
|
}
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
chan->s_refnum = refnum;
|
|
|
|
pcbit_l2_write(dev, MSG_DISC_REQ, refnum, skb, len);
|
|
}
|
|
|
|
/*
|
|
* Disc confirm received send BHUP
|
|
* Problem: when the HL driver sends the disc req itself
|
|
* LL receives BHUP
|
|
*/
|
|
void cb_disc_3(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
isdn_ctrl ictl;
|
|
|
|
ictl.command = ISDN_STAT_BHUP;
|
|
ictl.driver=dev->id;
|
|
ictl.arg=chan->id;
|
|
dev->dev_if->statcallb(&ictl);
|
|
}
|
|
|
|
void cb_notdone(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
}
|
|
|
|
/*
|
|
* send activate b-chan protocol
|
|
*/
|
|
void cb_selp_1(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
struct sk_buff *skb;
|
|
int len;
|
|
ushort refnum;
|
|
|
|
if ((len = capi_activate_transp_req(chan, &skb)) < 0)
|
|
{
|
|
printk("capi_conn_activate_transp_req failed\n");
|
|
return;
|
|
}
|
|
|
|
refnum = last_ref_num++ & 0x7fffU;
|
|
chan->s_refnum = refnum;
|
|
|
|
pcbit_l2_write(dev, MSG_ACT_TRANSP_REQ, refnum, skb, len);
|
|
}
|
|
|
|
/*
|
|
* Inform User that the B-channel is available
|
|
*/
|
|
void cb_open(struct pcbit_dev * dev, struct pcbit_chan* chan,
|
|
struct callb_data *data)
|
|
{
|
|
isdn_ctrl ictl;
|
|
|
|
ictl.command = ISDN_STAT_BCONN;
|
|
ictl.driver=dev->id;
|
|
ictl.arg=chan->id;
|
|
dev->dev_if->statcallb(&ictl);
|
|
}
|
|
|
|
|
|
|