diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2009-01-04 21:43:23 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-04 21:43:23 -0800 |
commit | e5fd56ca4eb3a130882bbef69d6952ef6aca5c8d (patch) | |
tree | 4e0c6670335f2434fbe8f44554988ca9832a685a /net/dccp/ccid.h | |
parent | ddebc973c56b51b4e5d84d606f0430d81b895d67 (diff) | |
download | linux-3.10-e5fd56ca4eb3a130882bbef69d6952ef6aca5c8d.tar.gz linux-3.10-e5fd56ca4eb3a130882bbef69d6952ef6aca5c8d.tar.bz2 linux-3.10-e5fd56ca4eb3a130882bbef69d6952ef6aca5c8d.zip |
dccp: Clean up ccid.c after integration of CCID plugins
This patch cleans up after integrating the CCID modules and, in addition,
* moves the if/else cases from ccid_delete() into ccid_hc_{tx,rx}_delete();
* removes the 'gfp' argument to ccid_new() - since it is always gfp_any().
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ccid.h')
-rw-r--r-- | net/dccp/ccid.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h index 75c21c52ed7..facedd20b53 100644 --- a/net/dccp/ccid.h +++ b/net/dccp/ccid.h @@ -111,8 +111,7 @@ 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 struct ccid *ccid_new(unsigned char id, struct sock *sk, int rx, - gfp_t gfp); +extern struct ccid *ccid_new(const u8 id, struct sock *sk, bool rx); static inline int ccid_get_current_rx_ccid(struct dccp_sock *dp) { |