Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
067a4195
Commit
067a4195
authored
22 years ago
by
Kai Germaschewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ISDN: Fix __FUNCTION__ usage
parent
bd039e05
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
29 deletions
+29
-29
drivers/isdn/i4l/isdn_ppp.c
drivers/isdn/i4l/isdn_ppp.c
+29
-29
No files found.
drivers/isdn/i4l/isdn_ppp.c
View file @
067a4195
...
...
@@ -109,8 +109,8 @@ isdn_ppp_free(isdn_net_local * lp)
struct
ippp_struct
*
is
;
if
(
lp
->
ppp_slot
<
0
||
lp
->
ppp_slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: ppp_slot(%d) out of range
\n
"
,
lp
->
ppp_slot
);
printk
(
KERN_ERR
"%s
: ppp_slot(%d) out of range
\n
"
,
__FUNCTION__
,
lp
->
ppp_slot
);
return
0
;
}
...
...
@@ -129,8 +129,8 @@ isdn_ppp_free(isdn_net_local * lp)
spin_unlock
(
&
lp
->
netdev
->
pb
->
lock
);
#endif
/* CONFIG_ISDN_MPP */
if
(
lp
->
ppp_slot
<
0
||
lp
->
ppp_slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: ppp_slot(%d) now invalid
\n
"
,
lp
->
ppp_slot
);
printk
(
KERN_ERR
"%s
: ppp_slot(%d) now invalid
\n
"
,
__FUNCTION__
,
lp
->
ppp_slot
);
restore_flags
(
flags
);
return
0
;
}
...
...
@@ -231,8 +231,8 @@ void
isdn_ppp_wakeup_daemon
(
isdn_net_local
*
lp
)
{
if
(
lp
->
ppp_slot
<
0
||
lp
->
ppp_slot
>=
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: ppp_slot(%d) out of range
\n
"
,
lp
->
ppp_slot
);
printk
(
KERN_ERR
"%s
: ppp_slot(%d) out of range
\n
"
,
__FUNCTION__
,
lp
->
ppp_slot
);
return
;
}
ippp_table
[
lp
->
ppp_slot
]
->
state
=
IPPP_OPEN
|
IPPP_CONNECT
|
IPPP_NOBLOCK
;
...
...
@@ -250,8 +250,8 @@ isdn_ppp_closewait(int slot)
struct
ippp_struct
*
is
;
if
(
slot
<
0
||
slot
>=
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: slot(%d) out of range
\n
"
,
slot
);
printk
(
KERN_ERR
"%s
: slot(%d) out of range
\n
"
,
__FUNCTION__
,
slot
);
return
0
;
}
is
=
ippp_table
[
slot
];
...
...
@@ -351,7 +351,7 @@ isdn_ppp_release(struct inode *ino, struct file *file)
isdn_net_dev
*
p
=
is
->
lp
->
netdev
;
if
(
!
p
)
{
printk
(
KERN_ERR
__FUNCTION__
": no lp->netdev
\n
"
);
printk
(
KERN_ERR
"%s: no lp->netdev
\n
"
,
__FUNCTION__
);
unlock_kernel
();
return
0
;
}
...
...
@@ -1079,8 +1079,8 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
if
(
is
->
debug
&
0x20
)
printk
(
KERN_DEBUG
"isdn_ppp: VJC_UNCOMP
\n
"
);
if
(
net_dev
->
local
.
ppp_slot
<
0
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: net_dev->local->ppp_slot(%d) out of range
\n
"
,
net_dev
->
local
.
ppp_slot
);
printk
(
KERN_ERR
"%s
: net_dev->local->ppp_slot(%d) out of range
\n
"
,
__FUNCTION__
,
net_dev
->
local
.
ppp_slot
);
goto
drop_packet
;
}
if
(
slhc_remember
(
ippp_table
[
net_dev
->
local
.
ppp_slot
]
->
slcomp
,
skb
->
data
,
skb
->
len
)
<=
0
)
{
...
...
@@ -1105,8 +1105,8 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
skb_put
(
skb
,
skb_old
->
len
+
128
);
memcpy
(
skb
->
data
,
skb_old
->
data
,
skb_old
->
len
);
if
(
net_dev
->
local
.
ppp_slot
<
0
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: net_dev->local->ppp_slot(%d) out of range
\n
"
,
net_dev
->
local
.
ppp_slot
);
printk
(
KERN_ERR
"%s
: net_dev->local->ppp_slot(%d) out of range
\n
"
,
__FUNCTION__
,
net_dev
->
local
.
ppp_slot
);
goto
drop_packet
;
}
pkt_len
=
slhc_uncompress
(
ippp_table
[
net_dev
->
local
.
ppp_slot
]
->
slcomp
,
...
...
@@ -1442,8 +1442,8 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )
struct
ippp_struct
*
is
;
if
(
lp
->
ppp_slot
<
0
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: lp->ppp_slot(%d) out of range
\n
"
,
lp
->
ppp_slot
);
printk
(
KERN_ERR
"%s
: lp->ppp_slot(%d) out of range
\n
"
,
__FUNCTION__
,
lp
->
ppp_slot
);
return
(
-
EINVAL
);
}
...
...
@@ -1493,8 +1493,8 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
stats
=
&
mp
->
stats
;
slot
=
lp
->
ppp_slot
;
if
(
slot
<
0
||
slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: lp->ppp_slot(%d)
\n
"
,
lp
->
ppp_slot
);
printk
(
KERN_ERR
"%s
: lp->ppp_slot(%d)
\n
"
,
__FUNCTION__
,
lp
->
ppp_slot
);
stats
->
frame_drops
++
;
dev_kfree_skb
(
skb
);
spin_unlock_irqrestore
(
&
mp
->
lock
,
flags
);
...
...
@@ -1530,8 +1530,8 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
for
(
lpq
=
net_dev
->
queue
;;)
{
slot
=
lpq
->
ppp_slot
;
if
(
slot
<
0
||
slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: lpq->ppp_slot(%d)
\n
"
,
lpq
->
ppp_slot
);
printk
(
KERN_ERR
"%s
: lpq->ppp_slot(%d)
\n
"
,
__FUNCTION__
,
lpq
->
ppp_slot
);
}
else
{
u32
lls
=
ippp_table
[
slot
]
->
last_link_seqno
;
if
(
MP_LT
(
lls
,
minseq
))
...
...
@@ -1764,8 +1764,8 @@ void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,
unsigned
int
tot_len
;
if
(
lp
->
ppp_slot
<
0
||
lp
->
ppp_slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: lp->ppp_slot(%d) out of range
\n
"
,
lp
->
ppp_slot
);
printk
(
KERN_ERR
"%s
: lp->ppp_slot(%d) out of range
\n
"
,
__FUNCTION__
,
lp
->
ppp_slot
);
return
;
}
if
(
MP_FLAGS
(
from
)
==
(
MP_BEGIN_FRAG
|
MP_END_FRAG
)
)
{
...
...
@@ -2541,8 +2541,8 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
printk
(
KERN_DEBUG
"Received CCP frame from peer slot(%d)
\n
"
,
lp
->
ppp_slot
);
if
(
lp
->
ppp_slot
<
0
||
lp
->
ppp_slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: lp->ppp_slot(%d) out of range
\n
"
,
lp
->
ppp_slot
);
printk
(
KERN_ERR
"%s
: lp->ppp_slot(%d) out of range
\n
"
,
__FUNCTION__
,
lp
->
ppp_slot
);
return
;
}
is
=
ippp_table
[
lp
->
ppp_slot
];
...
...
@@ -2551,8 +2551,8 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
if
(
lp
->
master
)
{
int
slot
=
((
isdn_net_local
*
)
(
lp
->
master
->
priv
))
->
ppp_slot
;
if
(
slot
<
0
||
slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: slot(%d) out of range
\n
"
,
slot
);
printk
(
KERN_ERR
"%s
: slot(%d) out of range
\n
"
,
__FUNCTION__
,
slot
);
return
;
}
mis
=
ippp_table
[
slot
];
...
...
@@ -2715,8 +2715,8 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
if
(
!
skb
||
skb
->
len
<
3
)
return
;
if
(
slot
<
0
||
slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: lp->ppp_slot(%d) out of range
\n
"
,
slot
);
printk
(
KERN_ERR
"%s
: lp->ppp_slot(%d) out of range
\n
"
,
__FUNCTION__
,
slot
);
return
;
}
is
=
ippp_table
[
slot
];
...
...
@@ -2738,8 +2738,8 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
if
(
lp
->
master
)
{
slot
=
((
isdn_net_local
*
)
(
lp
->
master
->
priv
))
->
ppp_slot
;
if
(
slot
<
0
||
slot
>
ISDN_MAX_CHANNELS
)
{
printk
(
KERN_ERR
__FUNCTION__
"
: slot(%d) out of range
\n
"
,
slot
);
printk
(
KERN_ERR
"%s
: slot(%d) out of range
\n
"
,
__FUNCTION__
,
slot
);
return
;
}
mis
=
ippp_table
[
slot
];
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment