diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/net/pppol2tp.c | |
parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'drivers/net/pppol2tp.c')
-rw-r--r-- | drivers/net/pppol2tp.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index 244d7830c92a..79359919335b 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c | |||
@@ -1621,9 +1621,16 @@ out_no_ppp: | |||
1621 | end: | 1621 | end: |
1622 | release_sock(sk); | 1622 | release_sock(sk); |
1623 | 1623 | ||
1624 | if (error != 0) | 1624 | if (error != 0) { |
1625 | PRINTK(session ? session->debug : -1, PPPOL2TP_MSG_CONTROL, KERN_WARNING, | 1625 | if (session) |
1626 | "%s: connect failed: %d\n", session->name, error); | 1626 | PRINTK(session->debug, |
1627 | PPPOL2TP_MSG_CONTROL, KERN_WARNING, | ||
1628 | "%s: connect failed: %d\n", | ||
1629 | session->name, error); | ||
1630 | else | ||
1631 | PRINTK(-1, PPPOL2TP_MSG_CONTROL, KERN_WARNING, | ||
1632 | "connect failed: %d\n", error); | ||
1633 | } | ||
1627 | 1634 | ||
1628 | return error; | 1635 | return error; |
1629 | } | 1636 | } |