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/feat.c | |
| 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/feat.c')
| -rw-r--r-- | net/dccp/feat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/feat.c b/net/dccp/feat.c index 30f9fb76b92..741b2db2473 100644 --- a/net/dccp/feat.c +++ b/net/dccp/feat.c @@ -34,7 +34,7 @@ static int dccp_hdlr_ccid(struct sock *sk, u64 ccid, bool rx) { struct dccp_sock *dp = dccp_sk(sk); - struct ccid *new_ccid = ccid_new(ccid, sk, rx, gfp_any()); + struct ccid *new_ccid = ccid_new(ccid, sk, rx); if (new_ccid == NULL) return -ENOMEM; |