git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
net
/
llc
/
llc_c_ac.c
diff --git
a/net/llc/llc_c_ac.c
b/net/llc/llc_c_ac.c
index
71a0022
..
019c780
100644
(file)
--- a/
net/llc/llc_c_ac.c
+++ b/
net/llc/llc_c_ac.c
@@
-1430,7
+1430,7
@@
static void llc_process_tmr_ev(struct sock *sk, struct sk_buff *skb)
{
if (llc_sk(sk)->state == LLC_CONN_OUT_OF_SVC) {
printk(KERN_WARNING "%s: timer called on closed connection\n",
- __
FUNCTION
__);
+ __
func
__);
kfree_skb(skb);
} else {
if (!sock_owned_by_user(sk))