Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / net / dccp / ccid.h

diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h
index 20ba066b2775ec3971b3b6aafa7041d1282fc684..fdeae7b5731950ed3caa776cf82a0d35f2771012 100644 (file)
--- a/net/dccp/ccid.h
+++ b/net/dccp/ccid.h
@@ -103,32 +103,13 @@ static inline void *ccid_priv(const struct ccid *ccid)
        return (void *)ccid->ccid_priv;
 }
 
-extern bool ccid_support_check(u8 const *ccid_array, u8 array_len);
-extern int  ccid_get_builtin_ccids(u8 **ccid_array, u8 *array_len);
-extern int  ccid_getsockopt_builtin_ccids(struct sock *sk, int len,
-                                         char __user *, int __user *);
-
-extern int    ccid_request_modules(u8 const *ccid_array, u8 array_len);
 extern struct ccid *ccid_new(unsigned char id, struct sock *sk, int rx,
                             gfp_t gfp);
 
-static inline int ccid_get_current_rx_ccid(struct dccp_sock *dp)
-{
-       struct ccid *ccid = dp->dccps_hc_rx_ccid;
-
-       if (ccid == NULL || ccid->ccid_ops == NULL)
-               return -1;
-       return ccid->ccid_ops->ccid_id;
-}
-
-static inline int ccid_get_current_tx_ccid(struct dccp_sock *dp)
-{
-       struct ccid *ccid = dp->dccps_hc_tx_ccid;
-
-       if (ccid == NULL || ccid->ccid_ops == NULL)
-               return -1;
-       return ccid->ccid_ops->ccid_id;
-}
+extern struct ccid *ccid_hc_rx_new(unsigned char id, struct sock *sk,
+                                  gfp_t gfp);
+extern struct ccid *ccid_hc_tx_new(unsigned char id, struct sock *sk,
+                                  gfp_t gfp);
 
 extern void ccid_hc_rx_delete(struct ccid *ccid, struct sock *sk);
 extern void ccid_hc_tx_delete(struct ccid *ccid, struct sock *sk);