Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
  [NETPOLL]: Fix local_bh_enable() warning.
  [IPVS]: Make ip_vs_sync.c <= 80col wide.
  [IPVS]: Use msleep_interruptable() instead of ssleep() aka msleep()
  [HAMRADIO]: Fix baycom_epp.c compile failure.
  [DCCP]: Whitespace cleanups
  [DCCP] ccid3: Fixup some type conversions related to rtts
  [DCCP] ccid3: BUG-FIX - conversion errors
  [DCCP] ccid3: Reorder packet history source file
  [DCCP] ccid3: Reorder packet history header file
  [DCCP] ccid3: Make debug output consistent
  [DCCP] ccid3: Perform history operations only after packet has been sent
  [DCCP] ccid3: TX history - remove unused field
  [DCCP] ccid3: Shift window counter computation
  [DCCP] ccid3: Sanity-check RTT samples
  [DCCP] ccid3: Initialise RTT values
  [DCCP] ccid: Deprecate ccid_hc_tx_insert_options
  [DCCP]: Warn when discarding packet due to internal errors
  [DCCP]: Only deliver to the CCID rx side in charge
  [DCCP]: Simplify TFRC calculation
  [DCCP]: Debug timeval operations
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index 4dc487f27a1f..95b6927ec653 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -329,7 +329,7 @@ static void dccp_feat_empty_confirm(struct dccp_minisock *dmsk,
         switch (type) {
         case DCCPO_CHANGE_L: opt->dccpop_type = DCCPO_CONFIRM_R; break;
         case DCCPO_CHANGE_R: opt->dccpop_type = DCCPO_CONFIRM_L; break;
-        default:             DCCP_WARN("invalid type %d\n", type); return;
+        default:             DCCP_WARN("invalid type %d\n", type); return;
 
         }
         opt->dccpop_feat = feature;
@@ -427,7 +427,7 @@ int dccp_feat_confirm_recv(struct sock *sk, u8 type, u8 feature,
         switch (type) {
         case DCCPO_CONFIRM_L: t = DCCPO_CHANGE_R; break;
         case DCCPO_CONFIRM_R: t = DCCPO_CHANGE_L; break;
-        default:              DCCP_WARN("invalid type %d\n", type);
+        default:              DCCP_WARN("invalid type %d\n", type);
                               return 1;
 
         }
@@ -610,7 +610,7 @@ const char *dccp_feat_typename(const u8 type)
         case DCCPO_CHANGE_R:  return("ChangeR");
         case DCCPO_CONFIRM_R: return("ConfirmR");
         /* the following case must not appear in feature negotation  */
-        default:              dccp_pr_debug("unknown type %d [BUG!]\n", type);
+        default:              dccp_pr_debug("unknown type %d [BUG!]\n", type);
         }
         return NULL;
 }