diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
| commit | 62910554656cdcd6b6f84a5154c4155aae4ca231 (patch) | |
| tree | dcf14004f6fd2ef7154362ff948bfeba0f3ea92d /drivers/net/skfp/srf.c | |
| parent | 22265a5c3c103cf8c50be62e6c90d045eb649e6d (diff) | |
| parent | ab9304717f7624c41927f442e6b6d418b2d8b3e4 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/skfp/srf.c')
| -rw-r--r-- | drivers/net/skfp/srf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/srf.c b/drivers/net/skfp/srf.c index 6caf713b744c..40882b3faba6 100644 --- a/drivers/net/skfp/srf.c +++ b/drivers/net/skfp/srf.c | |||
| @@ -414,7 +414,7 @@ static void smt_send_srf(struct s_smc *smc) | |||
| 414 | smt->smt_len = SMT_MAX_INFO_LEN - pcon.pc_len ; | 414 | smt->smt_len = SMT_MAX_INFO_LEN - pcon.pc_len ; |
| 415 | mb->sm_len = smt->smt_len + sizeof(struct smt_header) ; | 415 | mb->sm_len = smt->smt_len + sizeof(struct smt_header) ; |
| 416 | 416 | ||
| 417 | DB_SMT("SRF: sending SRF at %x, len %d \n",smt,mb->sm_len) ; | 417 | DB_SMT("SRF: sending SRF at %x, len %d\n",smt,mb->sm_len) ; |
| 418 | DB_SMT("SRF: state SR%d Threshold %d\n", | 418 | DB_SMT("SRF: state SR%d Threshold %d\n", |
| 419 | smc->srf.sr_state,smc->srf.SRThreshold/TICKS_PER_SECOND) ; | 419 | smc->srf.sr_state,smc->srf.SRThreshold/TICKS_PER_SECOND) ; |
| 420 | #ifdef DEBUG | 420 | #ifdef DEBUG |