dd6303df09
This removes two inlines which were both called in a single function only:
1) dccp_feat_change() is always called with either DCCPO_CHANGE_L or DCCPO_CHANGE_R as argument
* from dccp_set_socktopt_change() via do_dccp_setsockopt() with DCCP_SOCKOPT_CHANGE_R/L
* from __dccp_feat_init() via dccp_feat_init() also with DCCP_SOCKOPT_CHANGE_R/L.
Hence the dccp_feat_is_valid_type() is completely unnecessary and always returns true.
2) Due to (1), the length test reduces to 'len >= 4', which in turn makes
dccp_feat_is_valid_length() unnecessary.
Furthermore, the inline function dccp_feat_is_reserved() was unfolded,
since only called in a single place.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
40 lines
1.3 KiB
C
40 lines
1.3 KiB
C
#ifndef _DCCP_FEAT_H
|
|
#define _DCCP_FEAT_H
|
|
/*
|
|
* net/dccp/feat.h
|
|
*
|
|
* An implementation of the DCCP protocol
|
|
* Copyright (c) 2005 Andrea Bittau <a.bittau@cs.ucl.ac.uk>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include "dccp.h"
|
|
|
|
#ifdef CONFIG_IP_DCCP_DEBUG
|
|
extern const char *dccp_feat_typename(const u8 type);
|
|
extern const char *dccp_feat_name(const u8 feat);
|
|
|
|
static inline void dccp_feat_debug(const u8 type, const u8 feat, const u8 val)
|
|
{
|
|
dccp_pr_debug("%s(%s (%d), %d)\n", dccp_feat_typename(type),
|
|
dccp_feat_name(feat), feat, val);
|
|
}
|
|
#else
|
|
#define dccp_feat_debug(type, feat, val)
|
|
#endif /* CONFIG_IP_DCCP_DEBUG */
|
|
|
|
extern int dccp_feat_change(struct dccp_minisock *dmsk, u8 type, u8 feature,
|
|
u8 *val, u8 len, gfp_t gfp);
|
|
extern int dccp_feat_change_recv(struct sock *sk, u8 type, u8 feature,
|
|
u8 *val, u8 len);
|
|
extern int dccp_feat_confirm_recv(struct sock *sk, u8 type, u8 feature,
|
|
u8 *val, u8 len);
|
|
extern void dccp_feat_clean(struct dccp_minisock *dmsk);
|
|
extern int dccp_feat_clone(struct sock *oldsk, struct sock *newsk);
|
|
extern int dccp_feat_init(struct dccp_minisock *dmsk);
|
|
|
|
#endif /* _DCCP_FEAT_H */
|