[DCCP]: Fix sparse warnings
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8649b0d416
commit
a1d3a35518
|
@ -82,12 +82,13 @@ enum ccid3_options {
|
||||||
|
|
||||||
static int ccid3_debug;
|
static int ccid3_debug;
|
||||||
|
|
||||||
struct dccp_tx_hist *ccid3_tx_hist;
|
static struct dccp_tx_hist *ccid3_tx_hist;
|
||||||
struct dccp_rx_hist *ccid3_rx_hist;
|
static struct dccp_rx_hist *ccid3_rx_hist;
|
||||||
|
|
||||||
static kmem_cache_t *ccid3_loss_interval_hist_slab;
|
static kmem_cache_t *ccid3_loss_interval_hist_slab;
|
||||||
|
|
||||||
static inline struct ccid3_loss_interval_hist_entry *ccid3_loss_interval_hist_entry_new(int prio)
|
static inline struct ccid3_loss_interval_hist_entry *
|
||||||
|
ccid3_loss_interval_hist_entry_new(const unsigned int __nocast prio)
|
||||||
{
|
{
|
||||||
return kmem_cache_alloc(ccid3_loss_interval_hist_slab, prio);
|
return kmem_cache_alloc(ccid3_loss_interval_hist_slab, prio);
|
||||||
}
|
}
|
||||||
|
@ -1593,7 +1594,9 @@ static void ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb)
|
||||||
* These are integers as per section 8 of RFC3448. We can then divide by 4 *
|
* These are integers as per section 8 of RFC3448. We can then divide by 4 *
|
||||||
* when we use it.
|
* when we use it.
|
||||||
*/
|
*/
|
||||||
const int ccid3_hc_rx_w[TFRC_RECV_IVAL_F_LENGTH] = { 4, 4, 4, 4, 3, 2, 1, 1, };
|
static const int ccid3_hc_rx_w[TFRC_RECV_IVAL_F_LENGTH] = {
|
||||||
|
4, 4, 4, 4, 3, 2, 1, 1,
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* args: fvalue - function value to match
|
* args: fvalue - function value to match
|
||||||
|
@ -1601,7 +1604,7 @@ const int ccid3_hc_rx_w[TFRC_RECV_IVAL_F_LENGTH] = { 4, 4, 4, 4, 3, 2, 1, 1, };
|
||||||
*
|
*
|
||||||
* both fvalue and p are multiplied by 1,000,000 to use ints
|
* both fvalue and p are multiplied by 1,000,000 to use ints
|
||||||
*/
|
*/
|
||||||
u32 calcx_reverse_lookup(u32 fvalue) {
|
static u32 calcx_reverse_lookup(u32 fvalue) {
|
||||||
int ctr = 0;
|
int ctr = 0;
|
||||||
int small;
|
int small;
|
||||||
|
|
||||||
|
|
|
@ -231,19 +231,22 @@ extern void dccp_close(struct sock *sk, long timeout);
|
||||||
extern struct sk_buff *dccp_make_response(struct sock *sk,
|
extern struct sk_buff *dccp_make_response(struct sock *sk,
|
||||||
struct dst_entry *dst,
|
struct dst_entry *dst,
|
||||||
struct request_sock *req);
|
struct request_sock *req);
|
||||||
|
extern struct sk_buff *dccp_make_reset(struct sock *sk,
|
||||||
|
struct dst_entry *dst,
|
||||||
|
enum dccp_reset_codes code);
|
||||||
|
|
||||||
extern int dccp_connect(struct sock *sk);
|
extern int dccp_connect(struct sock *sk);
|
||||||
extern int dccp_disconnect(struct sock *sk, int flags);
|
extern int dccp_disconnect(struct sock *sk, int flags);
|
||||||
extern int dccp_getsockopt(struct sock *sk, int level, int optname,
|
extern int dccp_getsockopt(struct sock *sk, int level, int optname,
|
||||||
char *optval, int *optlen);
|
char __user *optval, int __user *optlen);
|
||||||
|
extern int dccp_setsockopt(struct sock *sk, int level, int optname,
|
||||||
|
char __user *optval, int optlen);
|
||||||
extern int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg);
|
extern int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg);
|
||||||
extern int dccp_sendmsg(struct kiocb *iocb, struct sock *sk,
|
extern int dccp_sendmsg(struct kiocb *iocb, struct sock *sk,
|
||||||
struct msghdr *msg, size_t size);
|
struct msghdr *msg, size_t size);
|
||||||
extern int dccp_recvmsg(struct kiocb *iocb, struct sock *sk,
|
extern int dccp_recvmsg(struct kiocb *iocb, struct sock *sk,
|
||||||
struct msghdr *msg, size_t len, int nonblock,
|
struct msghdr *msg, size_t len, int nonblock,
|
||||||
int flags, int *addr_len);
|
int flags, int *addr_len);
|
||||||
extern int dccp_setsockopt(struct sock *sk, int level, int optname,
|
|
||||||
char *optval, int optlen);
|
|
||||||
extern void dccp_shutdown(struct sock *sk, int how);
|
extern void dccp_shutdown(struct sock *sk, int how);
|
||||||
|
|
||||||
extern int dccp_v4_checksum(const struct sk_buff *skb,
|
extern int dccp_v4_checksum(const struct sk_buff *skb,
|
||||||
|
@ -419,7 +422,9 @@ struct dccp_ackpkts {
|
||||||
u8 dccpap_buf[0];
|
u8 dccpap_buf[0];
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct dccp_ackpkts *dccp_ackpkts_alloc(unsigned int len, int priority);
|
extern struct dccp_ackpkts *
|
||||||
|
dccp_ackpkts_alloc(unsigned int len,
|
||||||
|
const unsigned int __nocast priority);
|
||||||
extern void dccp_ackpkts_free(struct dccp_ackpkts *ap);
|
extern void dccp_ackpkts_free(struct dccp_ackpkts *ap);
|
||||||
extern int dccp_ackpkts_add(struct dccp_ackpkts *ap, u64 ackno, u8 state);
|
extern int dccp_ackpkts_add(struct dccp_ackpkts *ap, u64 ackno, u8 state);
|
||||||
extern void dccp_ackpkts_check_rcv_ackno(struct dccp_ackpkts *ap,
|
extern void dccp_ackpkts_check_rcv_ackno(struct dccp_ackpkts *ap,
|
||||||
|
|
|
@ -617,9 +617,6 @@ out:
|
||||||
sock_put(sk);
|
sock_put(sk);
|
||||||
}
|
}
|
||||||
|
|
||||||
extern struct sk_buff *dccp_make_reset(struct sock *sk, struct dst_entry *dst,
|
|
||||||
enum dccp_reset_codes code);
|
|
||||||
|
|
||||||
int dccp_v4_send_reset(struct sock *sk, enum dccp_reset_codes code)
|
int dccp_v4_send_reset(struct sock *sk, enum dccp_reset_codes code)
|
||||||
{
|
{
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
|
@ -881,7 +878,7 @@ static struct dst_entry* dccp_v4_route_skb(struct sock *sk,
|
||||||
return &rt->u.dst;
|
return &rt->u.dst;
|
||||||
}
|
}
|
||||||
|
|
||||||
void dccp_v4_ctl_send_reset(struct sk_buff *rxskb)
|
static void dccp_v4_ctl_send_reset(struct sk_buff *rxskb)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
struct dccp_hdr *rxdh = dccp_hdr(rxskb), *dh;
|
struct dccp_hdr *rxdh = dccp_hdr(rxskb), *dh;
|
||||||
|
@ -1268,7 +1265,7 @@ static int dccp_v4_init_sock(struct sock *sk)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int dccp_v4_destroy_sock(struct sock *sk)
|
static int dccp_v4_destroy_sock(struct sock *sk)
|
||||||
{
|
{
|
||||||
struct dccp_sock *dp = dccp_sk(sk);
|
struct dccp_sock *dp = dccp_sk(sk);
|
||||||
|
|
||||||
|
|
|
@ -499,7 +499,8 @@ void dccp_insert_options(struct sock *sk, struct sk_buff *skb)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct dccp_ackpkts *dccp_ackpkts_alloc(unsigned int len, int priority)
|
struct dccp_ackpkts *dccp_ackpkts_alloc(const unsigned int len,
|
||||||
|
const unsigned int __nocast priority)
|
||||||
{
|
{
|
||||||
struct dccp_ackpkts *ap = kmalloc(sizeof(*ap) + len, priority);
|
struct dccp_ackpkts *ap = kmalloc(sizeof(*ap) + len, priority);
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@ extern struct dccp_rx_hist_entry *
|
||||||
|
|
||||||
static inline struct dccp_tx_hist_entry *
|
static inline struct dccp_tx_hist_entry *
|
||||||
dccp_tx_hist_entry_new(struct dccp_tx_hist *hist,
|
dccp_tx_hist_entry_new(struct dccp_tx_hist *hist,
|
||||||
const int prio)
|
const unsigned int __nocast prio)
|
||||||
{
|
{
|
||||||
struct dccp_tx_hist_entry *entry = kmem_cache_alloc(hist->dccptxh_slab,
|
struct dccp_tx_hist_entry *entry = kmem_cache_alloc(hist->dccptxh_slab,
|
||||||
prio);
|
prio);
|
||||||
|
@ -130,7 +130,7 @@ static inline struct dccp_rx_hist_entry *
|
||||||
dccp_rx_hist_entry_new(struct dccp_rx_hist *hist,
|
dccp_rx_hist_entry_new(struct dccp_rx_hist *hist,
|
||||||
const u32 ndp,
|
const u32 ndp,
|
||||||
const struct sk_buff *skb,
|
const struct sk_buff *skb,
|
||||||
const int prio)
|
const unsigned int __nocast prio)
|
||||||
{
|
{
|
||||||
struct dccp_rx_hist_entry *entry = kmem_cache_alloc(hist->dccprxh_slab,
|
struct dccp_rx_hist_entry *entry = kmem_cache_alloc(hist->dccprxh_slab,
|
||||||
prio);
|
prio);
|
||||||
|
|
|
@ -147,7 +147,7 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
|
||||||
}
|
}
|
||||||
|
|
||||||
int dccp_setsockopt(struct sock *sk, int level, int optname,
|
int dccp_setsockopt(struct sock *sk, int level, int optname,
|
||||||
char *optval, int optlen)
|
char __user *optval, int optlen)
|
||||||
{
|
{
|
||||||
dccp_pr_debug("entry\n");
|
dccp_pr_debug("entry\n");
|
||||||
|
|
||||||
|
@ -158,7 +158,7 @@ int dccp_setsockopt(struct sock *sk, int level, int optname,
|
||||||
}
|
}
|
||||||
|
|
||||||
int dccp_getsockopt(struct sock *sk, int level, int optname,
|
int dccp_getsockopt(struct sock *sk, int level, int optname,
|
||||||
char *optval, int *optlen)
|
char __user *optval, int __user *optlen)
|
||||||
{
|
{
|
||||||
dccp_pr_debug("entry\n");
|
dccp_pr_debug("entry\n");
|
||||||
|
|
||||||
|
@ -439,7 +439,7 @@ void dccp_shutdown(struct sock *sk, int how)
|
||||||
dccp_pr_debug("entry\n");
|
dccp_pr_debug("entry\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
struct proto_ops inet_dccp_ops = {
|
static struct proto_ops inet_dccp_ops = {
|
||||||
.family = PF_INET,
|
.family = PF_INET,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.release = inet_release,
|
.release = inet_release,
|
||||||
|
@ -539,9 +539,11 @@ static int thash_entries;
|
||||||
module_param(thash_entries, int, 0444);
|
module_param(thash_entries, int, 0444);
|
||||||
MODULE_PARM_DESC(thash_entries, "Number of ehash buckets");
|
MODULE_PARM_DESC(thash_entries, "Number of ehash buckets");
|
||||||
|
|
||||||
|
#ifdef CONFIG_IP_DCCP_DEBUG
|
||||||
int dccp_debug;
|
int dccp_debug;
|
||||||
module_param(dccp_debug, int, 0444);
|
module_param(dccp_debug, int, 0444);
|
||||||
MODULE_PARM_DESC(dccp_debug, "Enable debug messages");
|
MODULE_PARM_DESC(dccp_debug, "Enable debug messages");
|
||||||
|
#endif
|
||||||
|
|
||||||
static int __init dccp_init(void)
|
static int __init dccp_init(void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue