Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / net / dccp / ccids / lib / packet_history.h

diff --git a/net/dccp/ccids/lib/packet_history.h b/net/dccp/ccids/lib/packet_history.h
index 1f960c19ea1bf0ca948403321efd30e09fb98de8..60d00f01539021742a329d212ed0dd84d12c7c7e 100644 (file)
--- a/net/dccp/ccids/lib/packet_history.h
+++ b/net/dccp/ccids/lib/packet_history.h
@@ -137,7 +137,7 @@ extern void                 dccp_rx_hist_delete(struct dccp_rx_hist *hist);
 static inline struct dccp_rx_hist_entry *
                        dccp_rx_hist_entry_new(struct dccp_rx_hist *hist,
                                               const struct sock *sk,
-                                              const u32 ndp,
+                                              const u32 ndp,
                                               const struct sk_buff *skb,
                                               const gfp_t prio)
 {
@@ -169,7 +169,7 @@ static inline struct dccp_rx_hist_entry *
 }
 
 extern int dccp_rx_hist_find_entry(const struct list_head *list, const u64 seq,
-                                  u8 *ccval);
+                                  u8 *ccval);
 extern struct dccp_rx_hist_entry *
                dccp_rx_hist_find_data_packet(const struct list_head *list);