net: cleanup unsigned to unsigned int
Use of "unsigned int" is preferred to bare "unsigned" in net tree. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
David S. Miller
parent
5e73ea1a31
commit
95c9617472
|
|
@ -125,8 +125,8 @@ struct ip_vs_service_user {
|
|||
|
||||
/* virtual service options */
|
||||
char sched_name[IP_VS_SCHEDNAME_MAXLEN];
|
||||
unsigned flags; /* virtual service flags */
|
||||
unsigned timeout; /* persistent timeout in sec */
|
||||
unsigned int flags; /* virtual service flags */
|
||||
unsigned int timeout; /* persistent timeout in sec */
|
||||
__be32 netmask; /* persistent netmask */
|
||||
};
|
||||
|
||||
|
|
@ -137,7 +137,7 @@ struct ip_vs_dest_user {
|
|||
__be16 port;
|
||||
|
||||
/* real server options */
|
||||
unsigned conn_flags; /* connection flags */
|
||||
unsigned int conn_flags; /* connection flags */
|
||||
int weight; /* destination weight */
|
||||
|
||||
/* thresholds for active connections */
|
||||
|
|
@ -187,8 +187,8 @@ struct ip_vs_service_entry {
|
|||
|
||||
/* service options */
|
||||
char sched_name[IP_VS_SCHEDNAME_MAXLEN];
|
||||
unsigned flags; /* virtual service flags */
|
||||
unsigned timeout; /* persistent timeout */
|
||||
unsigned int flags; /* virtual service flags */
|
||||
unsigned int timeout; /* persistent timeout */
|
||||
__be32 netmask; /* persistent netmask */
|
||||
|
||||
/* number of real servers */
|
||||
|
|
@ -202,7 +202,7 @@ struct ip_vs_service_entry {
|
|||
struct ip_vs_dest_entry {
|
||||
__be32 addr; /* destination address */
|
||||
__be16 port;
|
||||
unsigned conn_flags; /* connection flags */
|
||||
unsigned int conn_flags; /* connection flags */
|
||||
int weight; /* destination weight */
|
||||
|
||||
__u32 u_threshold; /* upper threshold */
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ struct hh_cache {
|
|||
struct header_ops {
|
||||
int (*create) (struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type, const void *daddr,
|
||||
const void *saddr, unsigned len);
|
||||
const void *saddr, unsigned int len);
|
||||
int (*parse)(const struct sk_buff *skb, unsigned char *haddr);
|
||||
int (*rebuild)(struct sk_buff *skb);
|
||||
int (*cache)(const struct neighbour *neigh, struct hh_cache *hh, __be16 type);
|
||||
|
|
@ -1689,7 +1689,7 @@ static inline void *skb_gro_network_header(struct sk_buff *skb)
|
|||
static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type,
|
||||
const void *daddr, const void *saddr,
|
||||
unsigned len)
|
||||
unsigned int len)
|
||||
{
|
||||
if (!dev->header_ops || !dev->header_ops->create)
|
||||
return 0;
|
||||
|
|
@ -1740,7 +1740,7 @@ struct softnet_data {
|
|||
unsigned int input_queue_head;
|
||||
unsigned int input_queue_tail;
|
||||
#endif
|
||||
unsigned dropped;
|
||||
unsigned int dropped;
|
||||
struct sk_buff_head input_pkt_queue;
|
||||
struct napi_struct backlog;
|
||||
};
|
||||
|
|
@ -1925,7 +1925,7 @@ static inline void netdev_sent_queue(struct net_device *dev, unsigned int bytes)
|
|||
}
|
||||
|
||||
static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue,
|
||||
unsigned pkts, unsigned bytes)
|
||||
unsigned int pkts, unsigned int bytes)
|
||||
{
|
||||
#ifdef CONFIG_BQL
|
||||
if (unlikely(!bytes))
|
||||
|
|
@ -1949,7 +1949,7 @@ static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue,
|
|||
}
|
||||
|
||||
static inline void netdev_completed_queue(struct net_device *dev,
|
||||
unsigned pkts, unsigned bytes)
|
||||
unsigned int pkts, unsigned int bytes)
|
||||
{
|
||||
netdev_tx_completed_queue(netdev_get_tx_queue(dev, 0), pkts, bytes);
|
||||
}
|
||||
|
|
@ -2144,9 +2144,9 @@ extern void netdev_rx_handler_unregister(struct net_device *dev);
|
|||
extern bool dev_valid_name(const char *name);
|
||||
extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *);
|
||||
extern int dev_ethtool(struct net *net, struct ifreq *);
|
||||
extern unsigned dev_get_flags(const struct net_device *);
|
||||
extern unsigned int dev_get_flags(const struct net_device *);
|
||||
extern int __dev_change_flags(struct net_device *, unsigned int flags);
|
||||
extern int dev_change_flags(struct net_device *, unsigned);
|
||||
extern int dev_change_flags(struct net_device *, unsigned int);
|
||||
extern void __dev_notify_flags(struct net_device *, unsigned int old_flags);
|
||||
extern int dev_change_name(struct net_device *, const char *);
|
||||
extern int dev_set_alias(struct net_device *, const char *, size_t);
|
||||
|
|
|
|||
|
|
@ -478,8 +478,8 @@ union ip_set_name_index {
|
|||
|
||||
#define IP_SET_OP_GET_BYNAME 0x00000006 /* Get set index by name */
|
||||
struct ip_set_req_get_set {
|
||||
unsigned op;
|
||||
unsigned version;
|
||||
unsigned int op;
|
||||
unsigned int version;
|
||||
union ip_set_name_index set;
|
||||
};
|
||||
|
||||
|
|
@ -488,8 +488,8 @@ struct ip_set_req_get_set {
|
|||
|
||||
#define IP_SET_OP_VERSION 0x00000100 /* Ask kernel version */
|
||||
struct ip_set_req_version {
|
||||
unsigned op;
|
||||
unsigned version;
|
||||
unsigned int op;
|
||||
unsigned int version;
|
||||
};
|
||||
|
||||
#endif /*_IP_SET_H */
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
typedef struct TransportAddress_ipAddress { /* SEQUENCE */
|
||||
int options; /* No use */
|
||||
unsigned ip;
|
||||
unsigned int ip;
|
||||
} TransportAddress_ipAddress;
|
||||
|
||||
typedef struct TransportAddress_ip6Address { /* SEQUENCE */
|
||||
int options; /* No use */
|
||||
unsigned ip;
|
||||
unsigned int ip;
|
||||
} TransportAddress_ip6Address;
|
||||
|
||||
typedef struct TransportAddress { /* CHOICE */
|
||||
|
|
@ -96,12 +96,12 @@ typedef struct DataType { /* CHOICE */
|
|||
|
||||
typedef struct UnicastAddress_iPAddress { /* SEQUENCE */
|
||||
int options; /* No use */
|
||||
unsigned network;
|
||||
unsigned int network;
|
||||
} UnicastAddress_iPAddress;
|
||||
|
||||
typedef struct UnicastAddress_iP6Address { /* SEQUENCE */
|
||||
int options; /* No use */
|
||||
unsigned network;
|
||||
unsigned int network;
|
||||
} UnicastAddress_iP6Address;
|
||||
|
||||
typedef struct UnicastAddress { /* CHOICE */
|
||||
|
|
@ -698,7 +698,7 @@ typedef struct RegistrationRequest { /* SEQUENCE */
|
|||
} options;
|
||||
RegistrationRequest_callSignalAddress callSignalAddress;
|
||||
RegistrationRequest_rasAddress rasAddress;
|
||||
unsigned timeToLive;
|
||||
unsigned int timeToLive;
|
||||
} RegistrationRequest;
|
||||
|
||||
typedef struct RegistrationConfirm_callSignalAddress { /* SEQUENCE OF */
|
||||
|
|
@ -730,7 +730,7 @@ typedef struct RegistrationConfirm { /* SEQUENCE */
|
|||
eRegistrationConfirm_genericData = (1 << 12),
|
||||
} options;
|
||||
RegistrationConfirm_callSignalAddress callSignalAddress;
|
||||
unsigned timeToLive;
|
||||
unsigned int timeToLive;
|
||||
} RegistrationConfirm;
|
||||
|
||||
typedef struct UnregistrationRequest_callSignalAddress { /* SEQUENCE OF */
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
|
|||
extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
|
||||
|
||||
extern int nfnetlink_has_listeners(struct net *net, unsigned int group);
|
||||
extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned group,
|
||||
extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned int group,
|
||||
int echo, gfp_t flags);
|
||||
extern int nfnetlink_set_err(struct net *net, u32 pid, u32 group, int error);
|
||||
extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u_int32_t pid, int flags);
|
||||
|
|
|
|||
|
|
@ -68,13 +68,13 @@ struct msghdr {
|
|||
__kernel_size_t msg_iovlen; /* Number of blocks */
|
||||
void * msg_control; /* Per protocol magic (eg BSD file descriptor passing) */
|
||||
__kernel_size_t msg_controllen; /* Length of cmsg list */
|
||||
unsigned msg_flags;
|
||||
unsigned int msg_flags;
|
||||
};
|
||||
|
||||
/* For recvmmsg/sendmmsg */
|
||||
struct mmsghdr {
|
||||
struct msghdr msg_hdr;
|
||||
unsigned msg_len;
|
||||
unsigned int msg_len;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ extern void addrconf_leave_solict(struct inet6_dev *idev,
|
|||
const struct in6_addr *addr);
|
||||
|
||||
static inline unsigned long addrconf_timeout_fixup(u32 timeout,
|
||||
unsigned unit)
|
||||
unsigned int unit)
|
||||
{
|
||||
if (timeout == 0xffffffff)
|
||||
return ~0UL;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ extern struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
|
|||
struct unix_address {
|
||||
atomic_t refcnt;
|
||||
int len;
|
||||
unsigned hash;
|
||||
unsigned int hash;
|
||||
struct sockaddr_un name[0];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -42,12 +42,12 @@ extern int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
|
|||
|
||||
extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *);
|
||||
extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr_storage *, int);
|
||||
extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned);
|
||||
extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned int);
|
||||
extern asmlinkage long compat_sys_sendmmsg(int, struct compat_mmsghdr __user *,
|
||||
unsigned, unsigned);
|
||||
extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
|
||||
unsigned int, unsigned int);
|
||||
extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned int);
|
||||
extern asmlinkage long compat_sys_recvmmsg(int, struct compat_mmsghdr __user *,
|
||||
unsigned, unsigned,
|
||||
unsigned int, unsigned int,
|
||||
struct compat_timespec __user *);
|
||||
extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
|
||||
extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ static inline void dn_sk_ports_copy(struct flowidn *fld, struct dn_scp *scp)
|
|||
fld->fld_dport = scp->addrrem;
|
||||
}
|
||||
|
||||
extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);
|
||||
extern unsigned int dn_mss_from_pmtu(struct net_device *dev, int mtu);
|
||||
|
||||
#define DN_MENUVER_ACC 0x01
|
||||
#define DN_MENUVER_USR 0x02
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ struct dn_fib_res {
|
|||
|
||||
struct dn_fib_nh {
|
||||
struct net_device *nh_dev;
|
||||
unsigned nh_flags;
|
||||
unsigned int nh_flags;
|
||||
unsigned char nh_scope;
|
||||
int nh_weight;
|
||||
int nh_power;
|
||||
|
|
@ -45,7 +45,7 @@ struct dn_fib_info {
|
|||
int fib_treeref;
|
||||
atomic_t fib_clntref;
|
||||
int fib_dead;
|
||||
unsigned fib_flags;
|
||||
unsigned int fib_flags;
|
||||
int fib_protocol;
|
||||
__le16 fib_prefsrc;
|
||||
__u32 fib_priority;
|
||||
|
|
@ -140,7 +140,7 @@ extern void dn_fib_table_cleanup(void);
|
|||
*/
|
||||
extern void dn_fib_rules_init(void);
|
||||
extern void dn_fib_rules_cleanup(void);
|
||||
extern unsigned dnet_addr_type(__le16 addr);
|
||||
extern unsigned int dnet_addr_type(__le16 addr);
|
||||
extern int dn_fib_lookup(struct flowidn *fld, struct dn_fib_res *res);
|
||||
|
||||
extern int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb);
|
||||
|
|
|
|||
|
|
@ -76,8 +76,8 @@ struct dn_route {
|
|||
__le16 rt_src_map;
|
||||
__le16 rt_dst_map;
|
||||
|
||||
unsigned rt_flags;
|
||||
unsigned rt_type;
|
||||
unsigned int rt_flags;
|
||||
unsigned int rt_type;
|
||||
};
|
||||
|
||||
static inline bool dn_is_input_route(struct dn_route *rt)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ struct sk_buff;
|
|||
struct dst_ops {
|
||||
unsigned short family;
|
||||
__be16 protocol;
|
||||
unsigned gc_thresh;
|
||||
unsigned int gc_thresh;
|
||||
|
||||
int (*gc)(struct dst_ops *ops);
|
||||
struct dst_entry * (*check)(struct dst_entry *, __u32 cookie);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
struct icmp_err {
|
||||
int errno;
|
||||
unsigned fatal:1;
|
||||
unsigned int fatal:1;
|
||||
};
|
||||
|
||||
extern const struct icmp_err icmp_err_convert[];
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ struct ifmcaddr6 {
|
|||
unsigned char mca_crcount;
|
||||
unsigned long mca_sfcount[2];
|
||||
struct timer_list mca_timer;
|
||||
unsigned mca_flags;
|
||||
unsigned int mca_flags;
|
||||
int mca_users;
|
||||
atomic_t mca_refcnt;
|
||||
spinlock_t mca_lock;
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ struct rt6_rtnl_dump_arg {
|
|||
|
||||
extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
|
||||
extern void rt6_ifdown(struct net *net, struct net_device *dev);
|
||||
extern void rt6_mtu_change(struct net_device *dev, unsigned mtu);
|
||||
extern void rt6_mtu_change(struct net_device *dev, unsigned int mtu);
|
||||
extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ struct fib_nh {
|
|||
struct net_device *nh_dev;
|
||||
struct hlist_node nh_hash;
|
||||
struct fib_info *nh_parent;
|
||||
unsigned nh_flags;
|
||||
unsigned int nh_flags;
|
||||
unsigned char nh_scope;
|
||||
#ifdef CONFIG_IP_ROUTE_MULTIPATH
|
||||
int nh_weight;
|
||||
|
|
@ -74,7 +74,7 @@ struct fib_info {
|
|||
struct net *fib_net;
|
||||
int fib_treeref;
|
||||
atomic_t fib_clntref;
|
||||
unsigned fib_flags;
|
||||
unsigned int fib_flags;
|
||||
unsigned char fib_dead;
|
||||
unsigned char fib_protocol;
|
||||
unsigned char fib_scope;
|
||||
|
|
|
|||
|
|
@ -580,8 +580,8 @@ struct ip_vs_service_user_kern {
|
|||
/* virtual service options */
|
||||
char *sched_name;
|
||||
char *pe_name;
|
||||
unsigned flags; /* virtual service flags */
|
||||
unsigned timeout; /* persistent timeout in sec */
|
||||
unsigned int flags; /* virtual service flags */
|
||||
unsigned int timeout; /* persistent timeout in sec */
|
||||
u32 netmask; /* persistent netmask */
|
||||
};
|
||||
|
||||
|
|
@ -592,7 +592,7 @@ struct ip_vs_dest_user_kern {
|
|||
u16 port;
|
||||
|
||||
/* real server options */
|
||||
unsigned conn_flags; /* connection flags */
|
||||
unsigned int conn_flags; /* connection flags */
|
||||
int weight; /* destination weight */
|
||||
|
||||
/* thresholds for active connections */
|
||||
|
|
@ -616,8 +616,8 @@ struct ip_vs_service {
|
|||
union nf_inet_addr addr; /* IP address for virtual service */
|
||||
__be16 port; /* port number for the service */
|
||||
__u32 fwmark; /* firewall mark of the service */
|
||||
unsigned flags; /* service status flags */
|
||||
unsigned timeout; /* persistent timeout in ticks */
|
||||
unsigned int flags; /* service status flags */
|
||||
unsigned int timeout; /* persistent timeout in ticks */
|
||||
__be32 netmask; /* grouping granularity */
|
||||
struct net *net;
|
||||
|
||||
|
|
@ -647,7 +647,7 @@ struct ip_vs_dest {
|
|||
u16 af; /* address family */
|
||||
__be16 port; /* port number of the server */
|
||||
union nf_inet_addr addr; /* IP address of the server */
|
||||
volatile unsigned flags; /* dest status flags */
|
||||
volatile unsigned int flags; /* dest status flags */
|
||||
atomic_t conn_flags; /* flags to copy to conn */
|
||||
atomic_t weight; /* server weight */
|
||||
|
||||
|
|
@ -953,7 +953,7 @@ static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
|
|||
* IPVS core functions
|
||||
* (from ip_vs_core.c)
|
||||
*/
|
||||
extern const char *ip_vs_proto_name(unsigned proto);
|
||||
extern const char *ip_vs_proto_name(unsigned int proto);
|
||||
extern void ip_vs_init_hash_table(struct list_head *table, int rows);
|
||||
#define IP_VS_INIT_HASH_TABLE(t) ip_vs_init_hash_table((t), ARRAY_SIZE((t)))
|
||||
|
||||
|
|
@ -1014,7 +1014,7 @@ extern void ip_vs_conn_fill_cport(struct ip_vs_conn *cp, __be16 cport);
|
|||
|
||||
struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p,
|
||||
const union nf_inet_addr *daddr,
|
||||
__be16 dport, unsigned flags,
|
||||
__be16 dport, unsigned int flags,
|
||||
struct ip_vs_dest *dest, __u32 fwmark);
|
||||
extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp);
|
||||
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ static inline int ipv6_addr_equal(const struct in6_addr *a1,
|
|||
static inline int __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
|
||||
unsigned int prefixlen)
|
||||
{
|
||||
unsigned pdw, pbi;
|
||||
unsigned int pdw, pbi;
|
||||
|
||||
/* check complete u32 in prefix */
|
||||
pdw = prefixlen >> 5;
|
||||
|
|
|
|||
|
|
@ -264,6 +264,6 @@ extern int llc_conn_ev_qlfy_set_status_rst_done(struct sock *sk,
|
|||
static __inline__ int llc_conn_space(struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
return atomic_read(&sk->sk_rmem_alloc) + skb->truesize <
|
||||
(unsigned)sk->sk_rcvbuf;
|
||||
(unsigned int)sk->sk_rcvbuf;
|
||||
}
|
||||
#endif /* LLC_C_EV_H */
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
|
|||
#ifdef CONFIG_BRIDGE_NETFILTER
|
||||
static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
|
||||
{
|
||||
unsigned seq, hh_alen;
|
||||
unsigned int seq, hh_alen;
|
||||
|
||||
do {
|
||||
seq = read_seqbegin(&hh->hh_lock);
|
||||
|
|
@ -335,7 +335,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
|
|||
|
||||
static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
|
||||
{
|
||||
unsigned seq;
|
||||
unsigned int seq;
|
||||
int hh_len;
|
||||
|
||||
do {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
struct net;
|
||||
|
||||
static inline unsigned net_hash_mix(struct net *net)
|
||||
static inline unsigned int net_hash_mix(struct net *net)
|
||||
{
|
||||
#ifdef CONFIG_NET_NS
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ struct nfc_genl_data {
|
|||
};
|
||||
|
||||
struct nfc_dev {
|
||||
unsigned idx;
|
||||
unsigned int idx;
|
||||
struct nfc_target *targets;
|
||||
int n_targets;
|
||||
int targets_generation;
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ extern int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
|
|||
/* Calculate maximal size of packet seen by hard_start_xmit
|
||||
routine of this device.
|
||||
*/
|
||||
static inline unsigned psched_mtu(const struct net_device *dev)
|
||||
static inline unsigned int psched_mtu(const struct net_device *dev)
|
||||
{
|
||||
return dev->mtu + dev->hard_header_len;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ struct rtable {
|
|||
__be32 rt_key_src;
|
||||
|
||||
int rt_genid;
|
||||
unsigned rt_flags;
|
||||
unsigned int rt_flags;
|
||||
__u16 rt_type;
|
||||
__u8 rt_key_tos;
|
||||
|
||||
|
|
@ -185,8 +185,8 @@ extern unsigned short ip_rt_frag_needed(struct net *net, const struct iphdr *iph
|
|||
unsigned short new_mtu, struct net_device *dev);
|
||||
extern void ip_rt_send_redirect(struct sk_buff *skb);
|
||||
|
||||
extern unsigned inet_addr_type(struct net *net, __be32 addr);
|
||||
extern unsigned inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);
|
||||
extern unsigned int inet_addr_type(struct net *net, __be32 addr);
|
||||
extern unsigned int inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);
|
||||
extern void ip_rt_multicast_event(struct in_device *);
|
||||
extern int ip_rt_ioctl(struct net *, unsigned int cmd, void __user *arg);
|
||||
extern void ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);
|
||||
|
|
|
|||
|
|
@ -1145,10 +1145,10 @@ struct sctp_outq {
|
|||
/* Data pending that has never been transmitted. */
|
||||
struct list_head out_chunk_list;
|
||||
|
||||
unsigned out_qlen; /* Total length of queued data chunks. */
|
||||
unsigned int out_qlen; /* Total length of queued data chunks. */
|
||||
|
||||
/* Error of send failed, may used in SCTP_SEND_FAILED event. */
|
||||
unsigned error;
|
||||
unsigned int error;
|
||||
|
||||
/* These are control chunks we want to send. */
|
||||
struct list_head control_chunk_list;
|
||||
|
|
@ -2000,8 +2000,8 @@ void sctp_assoc_update(struct sctp_association *old,
|
|||
__u32 sctp_association_get_next_tsn(struct sctp_association *);
|
||||
|
||||
void sctp_assoc_sync_pmtu(struct sctp_association *);
|
||||
void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned);
|
||||
void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned);
|
||||
void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned int);
|
||||
void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned int);
|
||||
void sctp_assoc_set_primary(struct sctp_association *,
|
||||
struct sctp_transport *);
|
||||
void sctp_assoc_del_nonprimary_peers(struct sctp_association *,
|
||||
|
|
|
|||
|
|
@ -1226,7 +1226,7 @@ extern void tcp_put_md5sig_pool(void);
|
|||
|
||||
extern int tcp_md5_hash_header(struct tcp_md5sig_pool *, const struct tcphdr *);
|
||||
extern int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, const struct sk_buff *,
|
||||
unsigned header_len);
|
||||
unsigned int header_len);
|
||||
extern int tcp_md5_hash_key(struct tcp_md5sig_pool *hp,
|
||||
const struct tcp_md5sig_key *key);
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ struct udp_table {
|
|||
extern struct udp_table udp_table;
|
||||
extern void udp_table_init(struct udp_table *, const char *);
|
||||
static inline struct udp_hslot *udp_hashslot(struct udp_table *table,
|
||||
struct net *net, unsigned num)
|
||||
struct net *net, unsigned int num)
|
||||
{
|
||||
return &table->hash[udp_hashfn(net, num, table->mask)];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -423,8 +423,8 @@ struct wimax_dev {
|
|||
int (*op_reset)(struct wimax_dev *wimax_dev);
|
||||
|
||||
struct rfkill *rfkill;
|
||||
unsigned rf_hw;
|
||||
unsigned rf_sw;
|
||||
unsigned int rf_hw;
|
||||
unsigned int rf_sw;
|
||||
char name[32];
|
||||
|
||||
struct dentry *debugfs_dentry;
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ static inline void x25_unregister_sysctl(void) {};
|
|||
#endif /* CONFIG_SYSCTL */
|
||||
|
||||
struct x25_skb_cb {
|
||||
unsigned flags;
|
||||
unsigned int flags;
|
||||
};
|
||||
#define X25_SKB_CB(s) ((struct x25_skb_cb *) ((s)->cb))
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
static int fc_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type,
|
||||
const void *daddr, const void *saddr, unsigned len)
|
||||
const void *daddr, const void *saddr, unsigned int len)
|
||||
{
|
||||
struct fch_hdr *fch;
|
||||
int hdr_len;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
|
||||
static int fddi_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type,
|
||||
const void *daddr, const void *saddr, unsigned len)
|
||||
const void *daddr, const void *saddr, unsigned int len)
|
||||
{
|
||||
int hl = FDDI_K_SNAP_HLEN;
|
||||
struct fddihdr *fddi;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
static int hippi_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type,
|
||||
const void *daddr, const void *saddr, unsigned len)
|
||||
const void *daddr, const void *saddr, unsigned int len)
|
||||
{
|
||||
struct hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN);
|
||||
struct hippi_cb *hcb = (struct hippi_cb *) skb->cb;
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ static inline unsigned long rif_hash(const unsigned char *addr)
|
|||
|
||||
static int tr_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type,
|
||||
const void *daddr, const void *saddr, unsigned len)
|
||||
const void *daddr, const void *saddr, unsigned int len)
|
||||
{
|
||||
struct trh_hdr *trh;
|
||||
int hdr_len;
|
||||
|
|
@ -193,7 +193,7 @@ __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
struct trh_hdr *trh;
|
||||
struct trllc *trllc;
|
||||
unsigned riflen=0;
|
||||
unsigned int riflen=0;
|
||||
|
||||
skb->dev = dev;
|
||||
skb_reset_mac_header(skb);
|
||||
|
|
|
|||
|
|
@ -1530,7 +1530,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
|
|||
|
||||
|
||||
p9_debug(P9_DEBUG_9P, ">>> TREAD fid %d offset %llu %d\n",
|
||||
fid->fid, (long long unsigned) offset, count);
|
||||
fid->fid, (unsigned long long) offset, count);
|
||||
err = 0;
|
||||
clnt = fid->clnt;
|
||||
|
||||
|
|
@ -1605,7 +1605,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
|
|||
struct p9_req_t *req;
|
||||
|
||||
p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %d\n",
|
||||
fid->fid, (long long unsigned) offset, count);
|
||||
fid->fid, (unsigned long long) offset, count);
|
||||
err = 0;
|
||||
clnt = fid->clnt;
|
||||
|
||||
|
|
@ -2040,7 +2040,7 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset)
|
|||
char *dataptr;
|
||||
|
||||
p9_debug(P9_DEBUG_9P, ">>> TREADDIR fid %d offset %llu count %d\n",
|
||||
fid->fid, (long long unsigned) offset, count);
|
||||
fid->fid, (unsigned long long) offset, count);
|
||||
|
||||
err = 0;
|
||||
clnt = fid->clnt;
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ error:
|
|||
clear_bit(Wworksched, &m->wsched);
|
||||
}
|
||||
|
||||
static int p9_pollwake(wait_queue_t *wait, unsigned mode, int sync, void *key)
|
||||
static int p9_pollwake(wait_queue_t *wait, unsigned int mode, int sync, void *key)
|
||||
{
|
||||
struct p9_poll_wait *pwait =
|
||||
container_of(wait, struct p9_poll_wait, wait);
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ struct br2684_vcc {
|
|||
#ifdef CONFIG_ATM_BR2684_IPFILTER
|
||||
struct br2684_filter filter;
|
||||
#endif /* CONFIG_ATM_BR2684_IPFILTER */
|
||||
unsigned copies_needed, copies_failed;
|
||||
unsigned int copies_needed, copies_failed;
|
||||
};
|
||||
|
||||
struct br2684_dev {
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ static ssize_t proc_mpc_write(struct file *file, const char __user *buff,
|
|||
size_t nbytes, loff_t *ppos)
|
||||
{
|
||||
char *page, *p;
|
||||
unsigned len;
|
||||
unsigned int len;
|
||||
|
||||
if (nbytes == 0)
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ void sigd_enq2(struct atm_vcc *vcc, enum atmsvc_msg_type type,
|
|||
{
|
||||
struct sk_buff *skb;
|
||||
struct atmsvc_msg *msg;
|
||||
static unsigned session = 0;
|
||||
static unsigned int session = 0;
|
||||
|
||||
pr_debug("%d (0x%p)\n", (int)type, vcc);
|
||||
while (!(skb = alloc_skb(sizeof(struct atmsvc_msg), GFP_KERNEL)))
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type, const void *daddr,
|
||||
const void *saddr, unsigned len)
|
||||
const void *saddr, unsigned int len)
|
||||
{
|
||||
unsigned char *buff;
|
||||
|
||||
|
|
@ -219,7 +219,7 @@ put:
|
|||
|
||||
int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type, const void *daddr,
|
||||
const void *saddr, unsigned len)
|
||||
const void *saddr, unsigned int len)
|
||||
{
|
||||
return -AX25_HEADER_LEN;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ static int store_bool_attr(char *buff, size_t count,
|
|||
atomic_read(attr) == 1 ? "enabled" : "disabled",
|
||||
enabled == 1 ? "enabled" : "disabled");
|
||||
|
||||
atomic_set(attr, (unsigned)enabled);
|
||||
atomic_set(attr, (unsigned int)enabled);
|
||||
return count;
|
||||
}
|
||||
|
||||
|
|
@ -268,7 +268,7 @@ static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr,
|
|||
"client" : "server", vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE ?
|
||||
"client" : "server");
|
||||
|
||||
atomic_set(&bat_priv->vis_mode, (unsigned)vis_mode_tmp);
|
||||
atomic_set(&bat_priv->vis_mode, (unsigned int)vis_mode_tmp);
|
||||
return count;
|
||||
}
|
||||
|
||||
|
|
@ -354,7 +354,7 @@ static ssize_t store_gw_mode(struct kobject *kobj, struct attribute *attr,
|
|||
curr_gw_mode_str, buff);
|
||||
|
||||
gw_deselect(bat_priv);
|
||||
atomic_set(&bat_priv->gw_mode, (unsigned)gw_mode_tmp);
|
||||
atomic_set(&bat_priv->gw_mode, (unsigned int)gw_mode_tmp);
|
||||
return count;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ static inline int should_deliver(const struct net_bridge_port *p,
|
|||
p->state == BR_STATE_FORWARDING);
|
||||
}
|
||||
|
||||
static inline unsigned packet_length(const struct sk_buff *skb)
|
||||
static inline unsigned int packet_length(const struct sk_buff *skb)
|
||||
{
|
||||
return skb->len - (skb->protocol == htons(ETH_P_8021Q) ? VLAN_HLEN : 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -512,8 +512,8 @@ static struct net_bridge_mdb_entry *br_multicast_get_group(
|
|||
struct net_bridge_mdb_htable *mdb;
|
||||
struct net_bridge_mdb_entry *mp;
|
||||
struct hlist_node *p;
|
||||
unsigned count = 0;
|
||||
unsigned max;
|
||||
unsigned int count = 0;
|
||||
unsigned int max;
|
||||
int elasticity;
|
||||
int err;
|
||||
|
||||
|
|
@ -1281,8 +1281,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
|
|||
struct sk_buff *skb2 = skb;
|
||||
const struct iphdr *iph;
|
||||
struct igmphdr *ih;
|
||||
unsigned len;
|
||||
unsigned offset;
|
||||
unsigned int len;
|
||||
unsigned int offset;
|
||||
int err;
|
||||
|
||||
/* We treat OOM as packet loss for now. */
|
||||
|
|
@ -1382,7 +1382,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
|
|||
u8 icmp6_type;
|
||||
u8 nexthdr;
|
||||
__be16 frag_off;
|
||||
unsigned len;
|
||||
unsigned int len;
|
||||
int offset;
|
||||
int err;
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port)
|
|||
int err = -ENOBUFS;
|
||||
|
||||
br_debug(port->br, "port %u(%s) event %d\n",
|
||||
(unsigned)port->port_no, port->dev->name, event);
|
||||
(unsigned int)port->port_no, port->dev->name, event);
|
||||
|
||||
skb = nlmsg_new(br_nlmsg_size(), GFP_ATOMIC);
|
||||
if (skb == NULL)
|
||||
|
|
|
|||
|
|
@ -29,10 +29,9 @@
|
|||
#define BR_MIN_PATH_COST 1
|
||||
#define BR_MAX_PATH_COST 65535
|
||||
|
||||
struct br_config_bpdu
|
||||
{
|
||||
unsigned topology_change:1;
|
||||
unsigned topology_change_ack:1;
|
||||
struct br_config_bpdu {
|
||||
unsigned int topology_change:1;
|
||||
unsigned int topology_change_ack:1;
|
||||
bridge_id root;
|
||||
int root_path_cost;
|
||||
bridge_id bridge_id;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ static const char *const br_port_state_names[] = {
|
|||
void br_log_state(const struct net_bridge_port *p)
|
||||
{
|
||||
br_info(p->br, "port %u(%s) entered %s state\n",
|
||||
(unsigned) p->port_no, p->dev->name,
|
||||
(unsigned int) p->port_no, p->dev->name,
|
||||
br_port_state_names[p->state]);
|
||||
}
|
||||
|
||||
|
|
@ -478,7 +478,7 @@ void br_received_tcn_bpdu(struct net_bridge_port *p)
|
|||
{
|
||||
if (br_is_designated_port(p)) {
|
||||
br_info(p->br, "port %u(%s) received tcn bpdu\n",
|
||||
(unsigned) p->port_no, p->dev->name);
|
||||
(unsigned int) p->port_no, p->dev->name);
|
||||
|
||||
br_topology_change_detection(p->br);
|
||||
br_topology_change_acknowledge(p);
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ static void br_message_age_timer_expired(unsigned long arg)
|
|||
return;
|
||||
|
||||
br_info(br, "port %u(%s) neighbor %.2x%.2x.%pM lost\n",
|
||||
(unsigned) p->port_no, p->dev->name,
|
||||
(unsigned int) p->port_no, p->dev->name,
|
||||
id->prio[0], id->prio[1], &id->addr);
|
||||
|
||||
/*
|
||||
|
|
@ -84,7 +84,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
|
|||
struct net_bridge *br = p->br;
|
||||
|
||||
br_debug(br, "port %u(%s) forward delay timer\n",
|
||||
(unsigned) p->port_no, p->dev->name);
|
||||
(unsigned int) p->port_no, p->dev->name);
|
||||
spin_lock(&br->lock);
|
||||
if (p->state == BR_STATE_LISTENING) {
|
||||
p->state = BR_STATE_LEARNING;
|
||||
|
|
@ -131,7 +131,7 @@ static void br_hold_timer_expired(unsigned long arg)
|
|||
struct net_bridge_port *p = (struct net_bridge_port *) arg;
|
||||
|
||||
br_debug(p->br, "port %u(%s) hold timer expired\n",
|
||||
(unsigned) p->port_no, p->dev->name);
|
||||
(unsigned int) p->port_no, p->dev->name);
|
||||
|
||||
spin_lock(&p->br->lock);
|
||||
if (p->config_pending)
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ static ssize_t store_group_addr(struct device *d,
|
|||
const char *buf, size_t len)
|
||||
{
|
||||
struct net_bridge *br = to_bridge(d);
|
||||
unsigned new_addr[6];
|
||||
unsigned int new_addr[6];
|
||||
int i;
|
||||
|
||||
if (!capable(CAP_NET_ADMIN))
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
|
|||
struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
|
||||
|
||||
if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
|
||||
(unsigned)sk->sk_rcvbuf && rx_flow_is_on(cf_sk)) {
|
||||
(unsigned int)sk->sk_rcvbuf && rx_flow_is_on(cf_sk)) {
|
||||
if (net_ratelimit())
|
||||
pr_debug("sending flow OFF (queue len = %d %d)\n",
|
||||
atomic_read(&cf_sk->sk.sk_rmem_alloc),
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
*/
|
||||
struct ceph_x_ticket_handler {
|
||||
struct rb_node node;
|
||||
unsigned service;
|
||||
unsigned int service;
|
||||
|
||||
struct ceph_crypto_key session_key;
|
||||
struct ceph_timespec validity;
|
||||
|
|
@ -27,7 +27,7 @@ struct ceph_x_ticket_handler {
|
|||
|
||||
struct ceph_x_authorizer {
|
||||
struct ceph_buffer *buf;
|
||||
unsigned service;
|
||||
unsigned int service;
|
||||
u64 nonce;
|
||||
char reply_buf[128]; /* big enough for encrypted blob */
|
||||
};
|
||||
|
|
@ -38,7 +38,7 @@ struct ceph_x_info {
|
|||
bool starting;
|
||||
u64 server_challenge;
|
||||
|
||||
unsigned have_keys;
|
||||
unsigned int have_keys;
|
||||
struct rb_root ticket_handlers;
|
||||
|
||||
struct ceph_x_authorizer auth_authorizer;
|
||||
|
|
|
|||
|
|
@ -441,8 +441,8 @@ EXPORT_SYMBOL(ceph_client_id);
|
|||
* create a fresh client instance
|
||||
*/
|
||||
struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private,
|
||||
unsigned supported_features,
|
||||
unsigned required_features)
|
||||
unsigned int supported_features,
|
||||
unsigned int required_features)
|
||||
{
|
||||
struct ceph_client *client;
|
||||
struct ceph_entity_addr *myaddr = NULL;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
c = c - a; c = c - b; c = c ^ (b >> 15); \
|
||||
} while (0)
|
||||
|
||||
unsigned ceph_str_hash_rjenkins(const char *str, unsigned length)
|
||||
unsigned int ceph_str_hash_rjenkins(const char *str, unsigned int length)
|
||||
{
|
||||
const unsigned char *k = (const unsigned char *)str;
|
||||
__u32 a, b, c; /* the internal state */
|
||||
|
|
@ -81,7 +81,7 @@ unsigned ceph_str_hash_rjenkins(const char *str, unsigned length)
|
|||
/*
|
||||
* linux dcache hash
|
||||
*/
|
||||
unsigned ceph_str_hash_linux(const char *str, unsigned length)
|
||||
unsigned int ceph_str_hash_linux(const char *str, unsigned int length)
|
||||
{
|
||||
unsigned long hash = 0;
|
||||
unsigned char c;
|
||||
|
|
@ -94,7 +94,7 @@ unsigned ceph_str_hash_linux(const char *str, unsigned length)
|
|||
}
|
||||
|
||||
|
||||
unsigned ceph_str_hash(int type, const char *s, unsigned len)
|
||||
unsigned int ceph_str_hash(int type, const char *s, unsigned int len)
|
||||
{
|
||||
switch (type) {
|
||||
case CEPH_STR_HASH_LINUX:
|
||||
|
|
|
|||
|
|
@ -68,8 +68,8 @@ int crush_find_rule(struct crush_map *map, int ruleset, int type, int size)
|
|||
static int bucket_perm_choose(struct crush_bucket *bucket,
|
||||
int x, int r)
|
||||
{
|
||||
unsigned pr = r % bucket->size;
|
||||
unsigned i, s;
|
||||
unsigned int pr = r % bucket->size;
|
||||
unsigned int i, s;
|
||||
|
||||
/* start a new permutation if @x has changed */
|
||||
if (bucket->perm_x != x || bucket->perm_n == 0) {
|
||||
|
|
@ -100,13 +100,13 @@ static int bucket_perm_choose(struct crush_bucket *bucket,
|
|||
for (i = 0; i < bucket->perm_n; i++)
|
||||
dprintk(" perm_choose have %d: %d\n", i, bucket->perm[i]);
|
||||
while (bucket->perm_n <= pr) {
|
||||
unsigned p = bucket->perm_n;
|
||||
unsigned int p = bucket->perm_n;
|
||||
/* no point in swapping the final entry */
|
||||
if (p < bucket->size - 1) {
|
||||
i = crush_hash32_3(bucket->hash, x, bucket->id, p) %
|
||||
(bucket->size - p);
|
||||
if (i) {
|
||||
unsigned t = bucket->perm[p + i];
|
||||
unsigned int t = bucket->perm[p + i];
|
||||
bucket->perm[p + i] = bucket->perm[p];
|
||||
bucket->perm[p] = t;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,9 +94,9 @@ static int monc_show(struct seq_file *s, void *p)
|
|||
mutex_lock(&monc->mutex);
|
||||
|
||||
if (monc->have_mdsmap)
|
||||
seq_printf(s, "have mdsmap %u\n", (unsigned)monc->have_mdsmap);
|
||||
seq_printf(s, "have mdsmap %u\n", (unsigned int)monc->have_mdsmap);
|
||||
if (monc->have_osdmap)
|
||||
seq_printf(s, "have osdmap %u\n", (unsigned)monc->have_osdmap);
|
||||
seq_printf(s, "have osdmap %u\n", (unsigned int)monc->have_osdmap);
|
||||
if (monc->want_next_osdmap)
|
||||
seq_printf(s, "want next osdmap\n");
|
||||
|
||||
|
|
@ -146,7 +146,7 @@ static int osdc_show(struct seq_file *s, void *pp)
|
|||
|
||||
if (req->r_reassert_version.epoch)
|
||||
seq_printf(s, "\t%u'%llu",
|
||||
(unsigned)le32_to_cpu(req->r_reassert_version.epoch),
|
||||
(unsigned int)le32_to_cpu(req->r_reassert_version.epoch),
|
||||
le64_to_cpu(req->r_reassert_version.version));
|
||||
else
|
||||
seq_printf(s, "\t");
|
||||
|
|
|
|||
|
|
@ -699,7 +699,7 @@ static int prepare_write_connect(struct ceph_messenger *msgr,
|
|||
struct ceph_connection *con,
|
||||
int include_banner)
|
||||
{
|
||||
unsigned global_seq = get_global_seq(con->msgr, 0);
|
||||
unsigned int global_seq = get_global_seq(con->msgr, 0);
|
||||
int proto;
|
||||
|
||||
switch (con->peer_name.type) {
|
||||
|
|
@ -816,7 +816,7 @@ static void iter_bio_next(struct bio **bio_iter, int *seg)
|
|||
static int write_partial_msg_pages(struct ceph_connection *con)
|
||||
{
|
||||
struct ceph_msg *msg = con->out_msg;
|
||||
unsigned data_len = le32_to_cpu(msg->hdr.data_len);
|
||||
unsigned int data_len = le32_to_cpu(msg->hdr.data_len);
|
||||
size_t len;
|
||||
bool do_datacrc = !con->msgr->nocrc;
|
||||
int ret;
|
||||
|
|
@ -1554,7 +1554,7 @@ static struct ceph_msg *ceph_alloc_msg(struct ceph_connection *con,
|
|||
|
||||
static int read_partial_message_pages(struct ceph_connection *con,
|
||||
struct page **pages,
|
||||
unsigned data_len, bool do_datacrc)
|
||||
unsigned int data_len, bool do_datacrc)
|
||||
{
|
||||
void *p;
|
||||
int ret;
|
||||
|
|
@ -1587,7 +1587,7 @@ static int read_partial_message_pages(struct ceph_connection *con,
|
|||
#ifdef CONFIG_BLOCK
|
||||
static int read_partial_message_bio(struct ceph_connection *con,
|
||||
struct bio **bio_iter, int *bio_seg,
|
||||
unsigned data_len, bool do_datacrc)
|
||||
unsigned int data_len, bool do_datacrc)
|
||||
{
|
||||
struct bio_vec *bv = bio_iovec_idx(*bio_iter, *bio_seg);
|
||||
void *p;
|
||||
|
|
@ -1629,7 +1629,7 @@ static int read_partial_message(struct ceph_connection *con)
|
|||
struct ceph_msg *m = con->in_msg;
|
||||
int ret;
|
||||
int to, left;
|
||||
unsigned front_len, middle_len, data_len;
|
||||
unsigned int front_len, middle_len, data_len;
|
||||
bool do_datacrc = !con->msgr->nocrc;
|
||||
int skip;
|
||||
u64 seq;
|
||||
|
|
@ -2345,9 +2345,9 @@ void ceph_con_revoke_message(struct ceph_connection *con, struct ceph_msg *msg)
|
|||
{
|
||||
mutex_lock(&con->mutex);
|
||||
if (con->in_msg && con->in_msg == msg) {
|
||||
unsigned front_len = le32_to_cpu(con->in_hdr.front_len);
|
||||
unsigned middle_len = le32_to_cpu(con->in_hdr.middle_len);
|
||||
unsigned data_len = le32_to_cpu(con->in_hdr.data_len);
|
||||
unsigned int front_len = le32_to_cpu(con->in_hdr.front_len);
|
||||
unsigned int middle_len = le32_to_cpu(con->in_hdr.middle_len);
|
||||
unsigned int data_len = le32_to_cpu(con->in_hdr.data_len);
|
||||
|
||||
/* skip rest of message */
|
||||
dout("con_revoke_pages %p msg %p revoked\n", con, msg);
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ static bool __sub_expired(struct ceph_mon_client *monc)
|
|||
*/
|
||||
static void __schedule_delayed(struct ceph_mon_client *monc)
|
||||
{
|
||||
unsigned delay;
|
||||
unsigned int delay;
|
||||
|
||||
if (monc->cur_mon < 0 || __sub_expired(monc))
|
||||
delay = 10 * HZ;
|
||||
|
|
@ -184,7 +184,7 @@ static void __schedule_delayed(struct ceph_mon_client *monc)
|
|||
static void __send_subscribe(struct ceph_mon_client *monc)
|
||||
{
|
||||
dout("__send_subscribe sub_sent=%u exp=%u want_osd=%d\n",
|
||||
(unsigned)monc->sub_sent, __sub_expired(monc),
|
||||
(unsigned int)monc->sub_sent, __sub_expired(monc),
|
||||
monc->want_next_osdmap);
|
||||
if ((__sub_expired(monc) && !monc->sub_sent) ||
|
||||
monc->want_next_osdmap == 1) {
|
||||
|
|
@ -201,7 +201,7 @@ static void __send_subscribe(struct ceph_mon_client *monc)
|
|||
|
||||
if (monc->want_next_osdmap) {
|
||||
dout("__send_subscribe to 'osdmap' %u\n",
|
||||
(unsigned)monc->have_osdmap);
|
||||
(unsigned int)monc->have_osdmap);
|
||||
ceph_encode_string(&p, end, "osdmap", 6);
|
||||
i = p;
|
||||
i->have = cpu_to_le64(monc->have_osdmap);
|
||||
|
|
@ -211,7 +211,7 @@ static void __send_subscribe(struct ceph_mon_client *monc)
|
|||
}
|
||||
if (monc->want_mdsmap) {
|
||||
dout("__send_subscribe to 'mdsmap' %u+\n",
|
||||
(unsigned)monc->have_mdsmap);
|
||||
(unsigned int)monc->have_mdsmap);
|
||||
ceph_encode_string(&p, end, "mdsmap", 6);
|
||||
i = p;
|
||||
i->have = cpu_to_le64(monc->have_mdsmap);
|
||||
|
|
@ -236,7 +236,7 @@ static void __send_subscribe(struct ceph_mon_client *monc)
|
|||
static void handle_subscribe_ack(struct ceph_mon_client *monc,
|
||||
struct ceph_msg *msg)
|
||||
{
|
||||
unsigned seconds;
|
||||
unsigned int seconds;
|
||||
struct ceph_mon_subscribe_ack *h = msg->front.iov_base;
|
||||
|
||||
if (msg->front.iov_len < sizeof(*h))
|
||||
|
|
|
|||
|
|
@ -1214,7 +1214,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
|
|||
}
|
||||
|
||||
if (!req->r_got_reply) {
|
||||
unsigned bytes;
|
||||
unsigned int bytes;
|
||||
|
||||
req->r_result = le32_to_cpu(rhead->result);
|
||||
bytes = le32_to_cpu(msg->hdr.data_len);
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ done:
|
|||
|
||||
/* maps */
|
||||
|
||||
static int calc_bits_of(unsigned t)
|
||||
static int calc_bits_of(unsigned int t)
|
||||
{
|
||||
int b = 0;
|
||||
while (t) {
|
||||
|
|
@ -154,7 +154,7 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
|
|||
magic = ceph_decode_32(p);
|
||||
if (magic != CRUSH_MAGIC) {
|
||||
pr_err("crush_decode magic %x != current %x\n",
|
||||
(unsigned)magic, (unsigned)CRUSH_MAGIC);
|
||||
(unsigned int)magic, (unsigned int)CRUSH_MAGIC);
|
||||
goto bad;
|
||||
}
|
||||
c->max_buckets = ceph_decode_32(p);
|
||||
|
|
@ -460,7 +460,7 @@ static void __remove_pg_pool(struct rb_root *root, struct ceph_pg_pool_info *pi)
|
|||
|
||||
static int __decode_pool(void **p, void *end, struct ceph_pg_pool_info *pi)
|
||||
{
|
||||
unsigned n, m;
|
||||
unsigned int n, m;
|
||||
|
||||
ceph_decode_copy(p, &pi->v, sizeof(pi->v));
|
||||
calc_pg_masks(pi);
|
||||
|
|
@ -970,7 +970,7 @@ void ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
|
|||
objsetno = stripeno / su_per_object;
|
||||
|
||||
*ono = objsetno * sc + stripepos;
|
||||
dout("objset %u * sc %u = ono %u\n", objsetno, sc, (unsigned)*ono);
|
||||
dout("objset %u * sc %u = ono %u\n", objsetno, sc, (unsigned int)*ono);
|
||||
|
||||
/* *oxoff = *off % layout->fl_stripe_unit; # offset in su */
|
||||
t = off;
|
||||
|
|
@ -998,12 +998,12 @@ int ceph_calc_object_layout(struct ceph_object_layout *ol,
|
|||
struct ceph_file_layout *fl,
|
||||
struct ceph_osdmap *osdmap)
|
||||
{
|
||||
unsigned num, num_mask;
|
||||
unsigned int num, num_mask;
|
||||
struct ceph_pg pgid;
|
||||
s32 preferred = (s32)le32_to_cpu(fl->fl_pg_preferred);
|
||||
int poolid = le32_to_cpu(fl->fl_pg_pool);
|
||||
struct ceph_pg_pool_info *pool;
|
||||
unsigned ps;
|
||||
unsigned int ps;
|
||||
|
||||
BUG_ON(!osdmap);
|
||||
|
||||
|
|
@ -1045,7 +1045,7 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
|
|||
struct ceph_pg_mapping *pg;
|
||||
struct ceph_pg_pool_info *pool;
|
||||
int ruleno;
|
||||
unsigned poolid, ps, pps, t;
|
||||
unsigned int poolid, ps, pps, t;
|
||||
int preferred;
|
||||
|
||||
poolid = le32_to_cpu(pgid.pool);
|
||||
|
|
|
|||
10
net/compat.c
10
net/compat.c
|
|
@ -741,13 +741,13 @@ static unsigned char nas[21] = {
|
|||
};
|
||||
#undef AL
|
||||
|
||||
asmlinkage long compat_sys_sendmsg(int fd, struct compat_msghdr __user *msg, unsigned flags)
|
||||
asmlinkage long compat_sys_sendmsg(int fd, struct compat_msghdr __user *msg, unsigned int flags)
|
||||
{
|
||||
return sys_sendmsg(fd, (struct msghdr __user *)msg, flags | MSG_CMSG_COMPAT);
|
||||
}
|
||||
|
||||
asmlinkage long compat_sys_sendmmsg(int fd, struct compat_mmsghdr __user *mmsg,
|
||||
unsigned vlen, unsigned int flags)
|
||||
unsigned int vlen, unsigned int flags)
|
||||
{
|
||||
return __sys_sendmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
|
||||
flags | MSG_CMSG_COMPAT);
|
||||
|
|
@ -758,20 +758,20 @@ asmlinkage long compat_sys_recvmsg(int fd, struct compat_msghdr __user *msg, uns
|
|||
return sys_recvmsg(fd, (struct msghdr __user *)msg, flags | MSG_CMSG_COMPAT);
|
||||
}
|
||||
|
||||
asmlinkage long compat_sys_recv(int fd, void __user *buf, size_t len, unsigned flags)
|
||||
asmlinkage long compat_sys_recv(int fd, void __user *buf, size_t len, unsigned int flags)
|
||||
{
|
||||
return sys_recv(fd, buf, len, flags | MSG_CMSG_COMPAT);
|
||||
}
|
||||
|
||||
asmlinkage long compat_sys_recvfrom(int fd, void __user *buf, size_t len,
|
||||
unsigned flags, struct sockaddr __user *addr,
|
||||
unsigned int flags, struct sockaddr __user *addr,
|
||||
int __user *addrlen)
|
||||
{
|
||||
return sys_recvfrom(fd, buf, len, flags | MSG_CMSG_COMPAT, addr, addrlen);
|
||||
}
|
||||
|
||||
asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
|
||||
unsigned vlen, unsigned int flags,
|
||||
unsigned int vlen, unsigned int flags,
|
||||
struct compat_timespec __user *timeout)
|
||||
{
|
||||
int datagrams;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ static inline int connection_based(struct sock *sk)
|
|||
return sk->sk_type == SOCK_SEQPACKET || sk->sk_type == SOCK_STREAM;
|
||||
}
|
||||
|
||||
static int receiver_wake_function(wait_queue_t *wait, unsigned mode, int sync,
|
||||
static int receiver_wake_function(wait_queue_t *wait, unsigned int mode, int sync,
|
||||
void *key)
|
||||
{
|
||||
unsigned long bits = (unsigned long)key;
|
||||
|
|
@ -158,7 +158,7 @@ out_noerr:
|
|||
* quite explicitly by POSIX 1003.1g, don't change them without having
|
||||
* the standard around please.
|
||||
*/
|
||||
struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags,
|
||||
struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
|
||||
int *peeked, int *off, int *err)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
|
|
@ -216,7 +216,7 @@ no_packet:
|
|||
}
|
||||
EXPORT_SYMBOL(__skb_recv_datagram);
|
||||
|
||||
struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
|
||||
struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned int flags,
|
||||
int noblock, int *err)
|
||||
{
|
||||
int peeked, off = 0;
|
||||
|
|
|
|||
|
|
@ -208,7 +208,8 @@ static inline void dev_base_seq_inc(struct net *net)
|
|||
|
||||
static inline struct hlist_head *dev_name_hash(struct net *net, const char *name)
|
||||
{
|
||||
unsigned hash = full_name_hash(name, strnlen(name, IFNAMSIZ));
|
||||
unsigned int hash = full_name_hash(name, strnlen(name, IFNAMSIZ));
|
||||
|
||||
return &net->dev_name_head[hash_32(hash, NETDEV_HASHBITS)];
|
||||
}
|
||||
|
||||
|
|
@ -4618,9 +4619,9 @@ void dev_set_rx_mode(struct net_device *dev)
|
|||
*
|
||||
* Get the combination of flag bits exported through APIs to userspace.
|
||||
*/
|
||||
unsigned dev_get_flags(const struct net_device *dev)
|
||||
unsigned int dev_get_flags(const struct net_device *dev)
|
||||
{
|
||||
unsigned flags;
|
||||
unsigned int flags;
|
||||
|
||||
flags = (dev->flags & ~(IFF_PROMISC |
|
||||
IFF_ALLMULTI |
|
||||
|
|
|
|||
|
|
@ -531,7 +531,7 @@ int sk_chk_filter(struct sock_filter *filter, unsigned int flen)
|
|||
* Compare this with conditional jumps below,
|
||||
* where offsets are limited. --ANK (981016)
|
||||
*/
|
||||
if (ftest->k >= (unsigned)(flen-pc-1))
|
||||
if (ftest->k >= (unsigned int)(flen-pc-1))
|
||||
return -EINVAL;
|
||||
break;
|
||||
case BPF_S_JMP_JEQ_K:
|
||||
|
|
|
|||
|
|
@ -890,7 +890,7 @@ static void neigh_timer_handler(unsigned long arg)
|
|||
{
|
||||
unsigned long now, next;
|
||||
struct neighbour *neigh = (struct neighbour *)arg;
|
||||
unsigned state;
|
||||
unsigned int state;
|
||||
int notify = 0;
|
||||
|
||||
write_lock(&neigh->lock);
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ NETDEVICE_SHOW(flags, fmt_hex);
|
|||
|
||||
static int change_flags(struct net_device *net, unsigned long new_flags)
|
||||
{
|
||||
return dev_change_flags(net, (unsigned) new_flags);
|
||||
return dev_change_flags(net, (unsigned int) new_flags);
|
||||
}
|
||||
|
||||
static ssize_t store_flags(struct device *dev, struct device_attribute *attr,
|
||||
|
|
@ -581,7 +581,7 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
|
|||
return err;
|
||||
}
|
||||
|
||||
map = kzalloc(max_t(unsigned,
|
||||
map = kzalloc(max_t(unsigned int,
|
||||
RPS_MAP_SIZE(cpumask_weight(mask)), L1_CACHE_BYTES),
|
||||
GFP_KERNEL);
|
||||
if (!map) {
|
||||
|
|
@ -902,7 +902,7 @@ static ssize_t bql_set_hold_time(struct netdev_queue *queue,
|
|||
const char *buf, size_t len)
|
||||
{
|
||||
struct dql *dql = &queue->dql;
|
||||
unsigned value;
|
||||
unsigned int value;
|
||||
int err;
|
||||
|
||||
err = kstrtouint(buf, 10, &value);
|
||||
|
|
@ -1106,7 +1106,7 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
|
|||
return err;
|
||||
}
|
||||
|
||||
new_dev_maps = kzalloc(max_t(unsigned,
|
||||
new_dev_maps = kzalloc(max_t(unsigned int,
|
||||
XPS_DEV_MAPS_SIZE, L1_CACHE_BYTES), GFP_KERNEL);
|
||||
if (!new_dev_maps) {
|
||||
free_cpumask_var(mask);
|
||||
|
|
|
|||
|
|
@ -320,7 +320,7 @@ struct pktgen_dev {
|
|||
(see RFC 3260, sec. 4) */
|
||||
|
||||
/* MPLS */
|
||||
unsigned nr_labels; /* Depth of stack, 0 = no MPLS */
|
||||
unsigned int nr_labels; /* Depth of stack, 0 = no MPLS */
|
||||
__be32 labels[MAX_MPLS_LABELS];
|
||||
|
||||
/* VLAN/SVLAN (802.1Q/Q-in-Q) */
|
||||
|
|
@ -373,10 +373,10 @@ struct pktgen_dev {
|
|||
*/
|
||||
char odevname[32];
|
||||
struct flow_state *flows;
|
||||
unsigned cflows; /* Concurrent flows (config) */
|
||||
unsigned lflow; /* Flow length (config) */
|
||||
unsigned nflows; /* accumulated flows (stats) */
|
||||
unsigned curfl; /* current sequenced flow (state)*/
|
||||
unsigned int cflows; /* Concurrent flows (config) */
|
||||
unsigned int lflow; /* Flow length (config) */
|
||||
unsigned int nflows; /* accumulated flows (stats) */
|
||||
unsigned int curfl; /* current sequenced flow (state)*/
|
||||
|
||||
u16 queue_map_min;
|
||||
u16 queue_map_max;
|
||||
|
|
@ -592,7 +592,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
|
|||
pkt_dev->src_mac_count, pkt_dev->dst_mac_count);
|
||||
|
||||
if (pkt_dev->nr_labels) {
|
||||
unsigned i;
|
||||
unsigned int i;
|
||||
seq_printf(seq, " mpls: ");
|
||||
for (i = 0; i < pkt_dev->nr_labels; i++)
|
||||
seq_printf(seq, "%08x%s", ntohl(pkt_dev->labels[i]),
|
||||
|
|
@ -812,7 +812,7 @@ done_str:
|
|||
|
||||
static ssize_t get_labels(const char __user *buffer, struct pktgen_dev *pkt_dev)
|
||||
{
|
||||
unsigned n = 0;
|
||||
unsigned int n = 0;
|
||||
char c;
|
||||
ssize_t i = 0;
|
||||
int len;
|
||||
|
|
@ -1510,7 +1510,7 @@ static ssize_t pktgen_if_write(struct file *file,
|
|||
}
|
||||
|
||||
if (!strcmp(name, "mpls")) {
|
||||
unsigned n, cnt;
|
||||
unsigned int n, cnt;
|
||||
|
||||
len = get_labels(&user_buffer[i], pkt_dev);
|
||||
if (len < 0)
|
||||
|
|
@ -2324,7 +2324,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
|
|||
}
|
||||
|
||||
if (pkt_dev->flags & F_MPLS_RND) {
|
||||
unsigned i;
|
||||
unsigned int i;
|
||||
for (i = 0; i < pkt_dev->nr_labels; i++)
|
||||
if (pkt_dev->labels[i] & MPLS_STACK_BOTTOM)
|
||||
pkt_dev->labels[i] = MPLS_STACK_BOTTOM |
|
||||
|
|
@ -2550,7 +2550,7 @@ err:
|
|||
|
||||
static void mpls_push(__be32 *mpls, struct pktgen_dev *pkt_dev)
|
||||
{
|
||||
unsigned i;
|
||||
unsigned int i;
|
||||
for (i = 0; i < pkt_dev->nr_labels; i++)
|
||||
*mpls++ = pkt_dev->labels[i] & ~MPLS_STACK_BOTTOM;
|
||||
|
||||
|
|
|
|||
|
|
@ -552,7 +552,7 @@ void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const void *data
|
|||
}
|
||||
EXPORT_SYMBOL(__rta_fill);
|
||||
|
||||
int rtnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned group, int echo)
|
||||
int rtnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned int group, int echo)
|
||||
{
|
||||
struct sock *rtnl = net->rtnl;
|
||||
int err = 0;
|
||||
|
|
@ -1953,7 +1953,7 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb)
|
|||
return skb->len;
|
||||
}
|
||||
|
||||
void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change)
|
||||
void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change)
|
||||
{
|
||||
struct net *net = dev_net(dev);
|
||||
struct sk_buff *skb;
|
||||
|
|
@ -2048,7 +2048,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
|
|||
struct rtattr *attr = (void *)nlh + NLMSG_ALIGN(min_len);
|
||||
|
||||
while (RTA_OK(attr, attrlen)) {
|
||||
unsigned flavor = attr->rta_type;
|
||||
unsigned int flavor = attr->rta_type;
|
||||
if (flavor) {
|
||||
if (flavor > rta_max[sz_idx])
|
||||
return -EINVAL;
|
||||
|
|
|
|||
|
|
@ -3166,7 +3166,7 @@ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
|
|||
int len = skb->len;
|
||||
|
||||
if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
|
||||
(unsigned)sk->sk_rcvbuf)
|
||||
(unsigned int)sk->sk_rcvbuf)
|
||||
return -ENOMEM;
|
||||
|
||||
skb_orphan(skb);
|
||||
|
|
|
|||
|
|
@ -1534,7 +1534,7 @@ struct sk_buff *sock_rmalloc(struct sock *sk, unsigned long size, int force,
|
|||
*/
|
||||
void *sock_kmalloc(struct sock *sk, int size, gfp_t priority)
|
||||
{
|
||||
if ((unsigned)size <= sysctl_optmem_max &&
|
||||
if ((unsigned int)size <= sysctl_optmem_max &&
|
||||
atomic_read(&sk->sk_omem_alloc) + size < sysctl_optmem_max) {
|
||||
void *mem;
|
||||
/* First do the add, to avoid the race if kmalloc
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ static void ccid3_update_send_interval(struct ccid3_hc_tx_sock *hc)
|
|||
|
||||
DCCP_BUG_ON(hc->tx_t_ipi == 0);
|
||||
ccid3_pr_debug("t_ipi=%u, s=%u, X=%u\n", hc->tx_t_ipi,
|
||||
hc->tx_s, (unsigned)(hc->tx_x >> 6));
|
||||
hc->tx_s, (unsigned int)(hc->tx_x >> 6));
|
||||
}
|
||||
|
||||
static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hc, ktime_t now)
|
||||
|
|
@ -153,9 +153,9 @@ static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp)
|
|||
|
||||
if (hc->tx_x != old_x) {
|
||||
ccid3_pr_debug("X_prev=%u, X_now=%u, X_calc=%u, "
|
||||
"X_recv=%u\n", (unsigned)(old_x >> 6),
|
||||
(unsigned)(hc->tx_x >> 6), hc->tx_x_calc,
|
||||
(unsigned)(hc->tx_x_recv >> 6));
|
||||
"X_recv=%u\n", (unsigned int)(old_x >> 6),
|
||||
(unsigned int)(hc->tx_x >> 6), hc->tx_x_calc,
|
||||
(unsigned int)(hc->tx_x_recv >> 6));
|
||||
|
||||
ccid3_update_send_interval(hc);
|
||||
}
|
||||
|
|
@ -425,8 +425,8 @@ done_computing_x:
|
|||
"p=%u, X_calc=%u, X_recv=%u, X=%u\n",
|
||||
dccp_role(sk), sk, hc->tx_rtt, r_sample,
|
||||
hc->tx_s, hc->tx_p, hc->tx_x_calc,
|
||||
(unsigned)(hc->tx_x_recv >> 6),
|
||||
(unsigned)(hc->tx_x >> 6));
|
||||
(unsigned int)(hc->tx_x_recv >> 6),
|
||||
(unsigned int)(hc->tx_x >> 6));
|
||||
|
||||
/* unschedule no feedback timer */
|
||||
sk_stop_timer(sk, &hc->tx_no_feedback_timer);
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo);
|
|||
* state, about 60 seconds */
|
||||
|
||||
/* RFC 1122, 4.2.3.1 initial RTO value */
|
||||
#define DCCP_TIMEOUT_INIT ((unsigned)(3 * HZ))
|
||||
#define DCCP_TIMEOUT_INIT ((unsigned int)(3 * HZ))
|
||||
|
||||
/*
|
||||
* The maximum back-off value for retransmissions. This is needed for
|
||||
|
|
@ -84,7 +84,7 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo);
|
|||
* - feature-negotiation retransmission (sec. 6.6.3),
|
||||
* - Acks in client-PARTOPEN state (sec. 8.1.5).
|
||||
*/
|
||||
#define DCCP_RTO_MAX ((unsigned)(64 * HZ))
|
||||
#define DCCP_RTO_MAX ((unsigned int)(64 * HZ))
|
||||
|
||||
/*
|
||||
* RTT sampling: sanity bounds and fallback RTT value from RFC 4340, section 3.4
|
||||
|
|
@ -287,9 +287,9 @@ extern struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,
|
|||
extern int dccp_child_process(struct sock *parent, struct sock *child,
|
||||
struct sk_buff *skb);
|
||||
extern int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
|
||||
struct dccp_hdr *dh, unsigned len);
|
||||
struct dccp_hdr *dh, unsigned int len);
|
||||
extern int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
|
||||
const struct dccp_hdr *dh, const unsigned len);
|
||||
const struct dccp_hdr *dh, const unsigned int len);
|
||||
|
||||
extern int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized);
|
||||
extern void dccp_destroy_sock(struct sock *sk);
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static int __dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
|
||||
const struct dccp_hdr *dh, const unsigned len)
|
||||
const struct dccp_hdr *dh, const unsigned int len)
|
||||
{
|
||||
struct dccp_sock *dp = dccp_sk(sk);
|
||||
|
||||
|
|
@ -366,7 +366,7 @@ discard:
|
|||
}
|
||||
|
||||
int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
|
||||
const struct dccp_hdr *dh, const unsigned len)
|
||||
const struct dccp_hdr *dh, const unsigned int len)
|
||||
{
|
||||
if (dccp_check_seqno(sk, skb))
|
||||
goto discard;
|
||||
|
|
@ -388,7 +388,7 @@ EXPORT_SYMBOL_GPL(dccp_rcv_established);
|
|||
static int dccp_rcv_request_sent_state_process(struct sock *sk,
|
||||
struct sk_buff *skb,
|
||||
const struct dccp_hdr *dh,
|
||||
const unsigned len)
|
||||
const unsigned int len)
|
||||
{
|
||||
/*
|
||||
* Step 4: Prepare sequence numbers in REQUEST
|
||||
|
|
@ -521,7 +521,7 @@ unable_to_proceed:
|
|||
static int dccp_rcv_respond_partopen_state_process(struct sock *sk,
|
||||
struct sk_buff *skb,
|
||||
const struct dccp_hdr *dh,
|
||||
const unsigned len)
|
||||
const unsigned int len)
|
||||
{
|
||||
struct dccp_sock *dp = dccp_sk(sk);
|
||||
u32 sample = dp->dccps_options_received.dccpor_timestamp_echo;
|
||||
|
|
@ -572,7 +572,7 @@ static int dccp_rcv_respond_partopen_state_process(struct sock *sk,
|
|||
}
|
||||
|
||||
int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
|
||||
struct dccp_hdr *dh, unsigned len)
|
||||
struct dccp_hdr *dh, unsigned int len)
|
||||
{
|
||||
struct dccp_sock *dp = dccp_sk(sk);
|
||||
struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ static void dn_unhash_sock_bh(struct sock *sk)
|
|||
static struct hlist_head *listen_hash(struct sockaddr_dn *addr)
|
||||
{
|
||||
int i;
|
||||
unsigned hash = addr->sdn_objnum;
|
||||
unsigned int hash = addr->sdn_objnum;
|
||||
|
||||
if (hash == 0) {
|
||||
hash = addr->sdn_objnamel;
|
||||
|
|
@ -1844,9 +1844,9 @@ static inline int dn_queue_too_long(struct dn_scp *scp, struct sk_buff_head *que
|
|||
* inclusion (or not) of the two 16 bit acknowledgement fields so it doesn't
|
||||
* make much practical difference.
|
||||
*/
|
||||
unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu)
|
||||
unsigned int dn_mss_from_pmtu(struct net_device *dev, int mtu)
|
||||
{
|
||||
unsigned mss = 230 - DN_MAX_NSP_DATA_HEADER;
|
||||
unsigned int mss = 230 - DN_MAX_NSP_DATA_HEADER;
|
||||
if (dev) {
|
||||
struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr);
|
||||
mtu -= LL_RESERVED_SPACE(dev);
|
||||
|
|
|
|||
|
|
@ -302,11 +302,12 @@ struct dn_fib_info *dn_fib_create_info(const struct rtmsg *r, struct dn_kern_rta
|
|||
struct rtattr *attr = RTA_DATA(rta->rta_mx);
|
||||
|
||||
while(RTA_OK(attr, attrlen)) {
|
||||
unsigned flavour = attr->rta_type;
|
||||
unsigned int flavour = attr->rta_type;
|
||||
|
||||
if (flavour) {
|
||||
if (flavour > RTAX_MAX)
|
||||
goto err_inval;
|
||||
fi->fib_metrics[flavour-1] = *(unsigned*)RTA_DATA(attr);
|
||||
fi->fib_metrics[flavour-1] = *(unsigned int *)RTA_DATA(attr);
|
||||
}
|
||||
attr = RTA_NEXT(attr, attrlen);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -588,7 +588,7 @@ static __inline__ int dn_queue_skb(struct sock *sk, struct sk_buff *skb, int sig
|
|||
number of warnings when compiling with -W --ANK
|
||||
*/
|
||||
if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
|
||||
(unsigned)sk->sk_rcvbuf) {
|
||||
(unsigned int)sk->sk_rcvbuf) {
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ static void dn_nsp_rtt(struct sock *sk, long rtt)
|
|||
*
|
||||
* Returns: The number of times the packet has been sent previously
|
||||
*/
|
||||
static inline unsigned dn_nsp_clone_and_send(struct sk_buff *skb,
|
||||
static inline unsigned int dn_nsp_clone_and_send(struct sk_buff *skb,
|
||||
gfp_t gfp)
|
||||
{
|
||||
struct dn_skb_cb *cb = DN_SKB_CB(skb);
|
||||
|
|
@ -240,7 +240,7 @@ void dn_nsp_output(struct sock *sk)
|
|||
{
|
||||
struct dn_scp *scp = DN_SK(sk);
|
||||
struct sk_buff *skb;
|
||||
unsigned reduce_win = 0;
|
||||
unsigned int reduce_win = 0;
|
||||
|
||||
/*
|
||||
* First we check for otherdata/linkservice messages
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ static int dn_route_input(struct sk_buff *);
|
|||
static void dn_run_flush(unsigned long dummy);
|
||||
|
||||
static struct dn_rt_hash_bucket *dn_rt_hash_table;
|
||||
static unsigned dn_rt_hash_mask;
|
||||
static unsigned int dn_rt_hash_mask;
|
||||
|
||||
static struct timer_list dn_route_timer;
|
||||
static DEFINE_TIMER(dn_rt_flush_timer, dn_run_flush, 0, 0);
|
||||
|
|
@ -149,13 +149,13 @@ static void dn_dst_destroy(struct dst_entry *dst)
|
|||
dst_destroy_metrics_generic(dst);
|
||||
}
|
||||
|
||||
static __inline__ unsigned dn_hash(__le16 src, __le16 dst)
|
||||
static __inline__ unsigned int dn_hash(__le16 src, __le16 dst)
|
||||
{
|
||||
__u16 tmp = (__u16 __force)(src ^ dst);
|
||||
tmp ^= (tmp >> 3);
|
||||
tmp ^= (tmp >> 5);
|
||||
tmp ^= (tmp >> 10);
|
||||
return dn_rt_hash_mask & (unsigned)tmp;
|
||||
return dn_rt_hash_mask & (unsigned int)tmp;
|
||||
}
|
||||
|
||||
static inline void dnrt_free(struct dn_route *rt)
|
||||
|
|
@ -297,7 +297,7 @@ static inline int compare_keys(struct flowidn *fl1, struct flowidn *fl2)
|
|||
(fl1->flowidn_iif ^ fl2->flowidn_iif)) == 0;
|
||||
}
|
||||
|
||||
static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route **rp)
|
||||
static int dn_insert_route(struct dn_route *rt, unsigned int hash, struct dn_route **rp)
|
||||
{
|
||||
struct dn_route *rth;
|
||||
struct dn_route __rcu **rthp;
|
||||
|
|
@ -934,8 +934,8 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *o
|
|||
struct dn_route *rt = NULL;
|
||||
struct net_device *dev_out = NULL, *dev;
|
||||
struct neighbour *neigh = NULL;
|
||||
unsigned hash;
|
||||
unsigned flags = 0;
|
||||
unsigned int hash;
|
||||
unsigned int flags = 0;
|
||||
struct dn_fib_res res = { .fi = NULL, .type = RTN_UNICAST };
|
||||
int err;
|
||||
int free_res = 0;
|
||||
|
|
@ -1209,7 +1209,7 @@ e_neighbour:
|
|||
*/
|
||||
static int __dn_route_output_key(struct dst_entry **pprt, const struct flowidn *flp, int flags)
|
||||
{
|
||||
unsigned hash = dn_hash(flp->saddr, flp->daddr);
|
||||
unsigned int hash = dn_hash(flp->saddr, flp->daddr);
|
||||
struct dn_route *rt = NULL;
|
||||
|
||||
if (!(flags & MSG_TRYHARD)) {
|
||||
|
|
@ -1275,7 +1275,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
|
|||
struct net_device *out_dev = NULL;
|
||||
struct dn_dev *dn_db;
|
||||
struct neighbour *neigh = NULL;
|
||||
unsigned hash;
|
||||
unsigned int hash;
|
||||
int flags = 0;
|
||||
__le16 gateway = 0;
|
||||
__le16 local_src = 0;
|
||||
|
|
@ -1490,7 +1490,7 @@ static int dn_route_input(struct sk_buff *skb)
|
|||
{
|
||||
struct dn_route *rt;
|
||||
struct dn_skb_cb *cb = DN_SKB_CB(skb);
|
||||
unsigned hash = dn_hash(cb->src, cb->dst);
|
||||
unsigned int hash = dn_hash(cb->src, cb->dst);
|
||||
|
||||
if (skb_dst(skb))
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -177,11 +177,11 @@ static int dn_fib_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
|
|||
return 1;
|
||||
}
|
||||
|
||||
unsigned dnet_addr_type(__le16 addr)
|
||||
unsigned int dnet_addr_type(__le16 addr)
|
||||
{
|
||||
struct flowidn fld = { .daddr = addr };
|
||||
struct dn_fib_res res;
|
||||
unsigned ret = RTN_UNICAST;
|
||||
unsigned int ret = RTN_UNICAST;
|
||||
struct dn_fib_table *tb = dn_fib_get_table(RT_TABLE_LOCAL, 0);
|
||||
|
||||
res.r = NULL;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ MODULE_DESCRIPTION("DNS Resolver");
|
|||
MODULE_AUTHOR("Wang Lei");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
unsigned dns_resolver_debug;
|
||||
unsigned int dns_resolver_debug;
|
||||
module_param_named(debug, dns_resolver_debug, uint, S_IWUSR | S_IRUGO);
|
||||
MODULE_PARM_DESC(debug, "DNS Resolver debugging mask");
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ extern const struct cred *dns_resolver_cache;
|
|||
/*
|
||||
* debug tracing
|
||||
*/
|
||||
extern unsigned dns_resolver_debug;
|
||||
extern unsigned int dns_resolver_debug;
|
||||
|
||||
#define kdebug(FMT, ...) \
|
||||
do { \
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ __setup("ether=", netdev_boot_setup);
|
|||
*/
|
||||
int eth_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type,
|
||||
const void *daddr, const void *saddr, unsigned len)
|
||||
const void *daddr, const void *saddr, unsigned int len)
|
||||
{
|
||||
struct ethhdr *eth = (struct ethhdr *)skb_push(skb, ETH_HLEN);
|
||||
|
||||
|
|
|
|||
|
|
@ -371,7 +371,7 @@ err:
|
|||
static int lowpan_header_create(struct sk_buff *skb,
|
||||
struct net_device *dev,
|
||||
unsigned short type, const void *_daddr,
|
||||
const void *_saddr, unsigned len)
|
||||
const void *_saddr, unsigned int len)
|
||||
{
|
||||
u8 tmp, iphc0, iphc1, *hc06_ptr;
|
||||
struct ipv6hdr *hdr;
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ struct dgram_sock {
|
|||
struct ieee802154_addr src_addr;
|
||||
struct ieee802154_addr dst_addr;
|
||||
|
||||
unsigned bound:1;
|
||||
unsigned want_ack:1;
|
||||
unsigned int bound:1;
|
||||
unsigned int want_ack:1;
|
||||
};
|
||||
|
||||
static inline struct dgram_sock *dgram_sk(const struct sock *sk)
|
||||
|
|
@ -206,7 +206,7 @@ static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk,
|
|||
struct msghdr *msg, size_t size)
|
||||
{
|
||||
struct net_device *dev;
|
||||
unsigned mtu;
|
||||
unsigned int mtu;
|
||||
struct sk_buff *skb;
|
||||
struct dgram_sock *ro = dgram_sk(sk);
|
||||
int hlen, tlen;
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|||
size_t size)
|
||||
{
|
||||
struct net_device *dev;
|
||||
unsigned mtu;
|
||||
unsigned int mtu;
|
||||
struct sk_buff *skb;
|
||||
int hlen, tlen;
|
||||
int err;
|
||||
|
|
|
|||
|
|
@ -1059,7 +1059,7 @@ static int arp_req_set(struct net *net, struct arpreq *r,
|
|||
neigh = __neigh_lookup_errno(&arp_tbl, &ip, dev);
|
||||
err = PTR_ERR(neigh);
|
||||
if (!IS_ERR(neigh)) {
|
||||
unsigned state = NUD_STALE;
|
||||
unsigned int state = NUD_STALE;
|
||||
if (r->arp_flags & ATF_PERM)
|
||||
state = NUD_PERMANENT;
|
||||
err = neigh_update(neigh, (r->arp_flags & ATF_COM) ?
|
||||
|
|
@ -1071,7 +1071,7 @@ static int arp_req_set(struct net *net, struct arpreq *r,
|
|||
return err;
|
||||
}
|
||||
|
||||
static unsigned arp_state_to_flags(struct neighbour *neigh)
|
||||
static unsigned int arp_state_to_flags(struct neighbour *neigh)
|
||||
{
|
||||
if (neigh->nud_state&NUD_PERMANENT)
|
||||
return ATF_PERM | ATF_COM;
|
||||
|
|
|
|||
|
|
@ -1125,7 +1125,7 @@ skip:
|
|||
}
|
||||
}
|
||||
|
||||
static inline bool inetdev_valid_mtu(unsigned mtu)
|
||||
static inline bool inetdev_valid_mtu(unsigned int mtu)
|
||||
{
|
||||
return mtu >= 68;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -136,13 +136,13 @@ static void fib_flush(struct net *net)
|
|||
* Find address type as if only "dev" was present in the system. If
|
||||
* on_dev is NULL then all interfaces are taken into consideration.
|
||||
*/
|
||||
static inline unsigned __inet_dev_addr_type(struct net *net,
|
||||
static inline unsigned int __inet_dev_addr_type(struct net *net,
|
||||
const struct net_device *dev,
|
||||
__be32 addr)
|
||||
{
|
||||
struct flowi4 fl4 = { .daddr = addr };
|
||||
struct fib_result res;
|
||||
unsigned ret = RTN_BROADCAST;
|
||||
unsigned int ret = RTN_BROADCAST;
|
||||
struct fib_table *local_table;
|
||||
|
||||
if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr))
|
||||
|
|
@ -740,7 +740,7 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)
|
|||
#define BRD_OK 2
|
||||
#define BRD0_OK 4
|
||||
#define BRD1_OK 8
|
||||
unsigned ok = 0;
|
||||
unsigned int ok = 0;
|
||||
int subnet = 0; /* Primary network */
|
||||
int gone = 1; /* Address is missing */
|
||||
int same_prefsrc = 0; /* Another primary with same IP */
|
||||
|
|
|
|||
|
|
@ -42,7 +42,8 @@ EXPORT_SYMBOL(sysctl_local_reserved_ports);
|
|||
|
||||
void inet_get_local_port_range(int *low, int *high)
|
||||
{
|
||||
unsigned seq;
|
||||
unsigned int seq;
|
||||
|
||||
do {
|
||||
seq = read_seqbegin(&sysctl_local_ports.lock);
|
||||
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ rescan:
|
|||
void inet_twdr_hangman(unsigned long data)
|
||||
{
|
||||
struct inet_timewait_death_row *twdr;
|
||||
int unsigned need_timer;
|
||||
unsigned int need_timer;
|
||||
|
||||
twdr = (struct inet_timewait_death_row *)data;
|
||||
spin_lock(&twdr->death_lock);
|
||||
|
|
|
|||
|
|
@ -413,7 +413,7 @@ int ip_options_compile(struct net *net,
|
|||
opt->is_changed = 1;
|
||||
}
|
||||
} else {
|
||||
unsigned overflow = optptr[3]>>4;
|
||||
unsigned int overflow = optptr[3]>>4;
|
||||
if (overflow == 15) {
|
||||
pp_ptr = optptr + 3;
|
||||
goto error;
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ static void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb)
|
|||
void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(skb->sk);
|
||||
unsigned flags = inet->cmsg_flags;
|
||||
unsigned int flags = inet->cmsg_flags;
|
||||
|
||||
/* Ordered by supposed usage frequency */
|
||||
if (flags & 1)
|
||||
|
|
@ -1094,7 +1094,7 @@ EXPORT_SYMBOL(compat_ip_setsockopt);
|
|||
*/
|
||||
|
||||
static int do_ip_getsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int __user *optlen, unsigned flags)
|
||||
char __user *optval, int __user *optlen, unsigned int flags)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sk);
|
||||
int val;
|
||||
|
|
|
|||
|
|
@ -1198,7 +1198,7 @@ static int __init ic_dynamic(void)
|
|||
d = ic_first_dev;
|
||||
retries = CONF_SEND_RETRIES;
|
||||
get_random_bytes(&timeout, sizeof(timeout));
|
||||
timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned) CONF_TIMEOUT_RANDOM);
|
||||
timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned int) CONF_TIMEOUT_RANDOM);
|
||||
for (;;) {
|
||||
/* Track the device we are configuring */
|
||||
ic_dev_xid = d->xid;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include <net/netfilter/nf_queue.h>
|
||||
|
||||
/* route_me_harder function, used by iptable_nat, iptable_mangle + ip_queue */
|
||||
int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
|
||||
int ip_route_me_harder(struct sk_buff *skb, unsigned int addr_type)
|
||||
{
|
||||
struct net *net = dev_net(skb_dst(skb)->dev);
|
||||
const struct iphdr *iph = ip_hdr(skb);
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ unsigned int arpt_do_table(struct sk_buff *skb,
|
|||
if (v < 0) {
|
||||
/* Pop from stack? */
|
||||
if (v != XT_RETURN) {
|
||||
verdict = (unsigned)(-v) - 1;
|
||||
verdict = (unsigned int)(-v) - 1;
|
||||
break;
|
||||
}
|
||||
e = back;
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ ipt_do_table(struct sk_buff *skb,
|
|||
if (v < 0) {
|
||||
/* Pop from stack? */
|
||||
if (v != XT_RETURN) {
|
||||
verdict = (unsigned)(-v) - 1;
|
||||
verdict = (unsigned int)(-v) - 1;
|
||||
break;
|
||||
}
|
||||
if (*stackptr <= origptr) {
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ static unsigned int ip_nat_sip_expect(struct sk_buff *skb, unsigned int dataoff,
|
|||
__be32 newip;
|
||||
u_int16_t port;
|
||||
char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")];
|
||||
unsigned buflen;
|
||||
unsigned int buflen;
|
||||
|
||||
/* Connection will come from reply */
|
||||
if (ct->tuplehash[dir].tuple.src.u3.ip == ct->tuplehash[!dir].tuple.dst.u3.ip)
|
||||
|
|
|
|||
|
|
@ -51,15 +51,16 @@ static struct ping_table ping_table;
|
|||
|
||||
static u16 ping_port_rover;
|
||||
|
||||
static inline int ping_hashfn(struct net *net, unsigned num, unsigned mask)
|
||||
static inline int ping_hashfn(struct net *net, unsigned int num, unsigned int mask)
|
||||
{
|
||||
int res = (num + net_hash_mix(net)) & mask;
|
||||
|
||||
pr_debug("hash(%d) = %d\n", num, res);
|
||||
return res;
|
||||
}
|
||||
|
||||
static inline struct hlist_nulls_head *ping_hashslot(struct ping_table *table,
|
||||
struct net *net, unsigned num)
|
||||
struct net *net, unsigned int num)
|
||||
{
|
||||
return &table->hash[ping_hashfn(net, num, PING_HTABLE_MASK)];
|
||||
}
|
||||
|
|
@ -188,7 +189,8 @@ static void inet_get_ping_group_range_net(struct net *net, gid_t *low,
|
|||
gid_t *high)
|
||||
{
|
||||
gid_t *data = net->ipv4.sysctl_ping_group_range;
|
||||
unsigned seq;
|
||||
unsigned int seq;
|
||||
|
||||
do {
|
||||
seq = read_seqbegin(&sysctl_local_ports.lock);
|
||||
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ static inline void rt_hash_lock_init(void)
|
|||
#endif
|
||||
|
||||
static struct rt_hash_bucket *rt_hash_table __read_mostly;
|
||||
static unsigned rt_hash_mask __read_mostly;
|
||||
static unsigned int rt_hash_mask __read_mostly;
|
||||
static unsigned int rt_hash_log __read_mostly;
|
||||
|
||||
static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat);
|
||||
|
|
@ -1143,7 +1143,7 @@ static int rt_bind_neighbour(struct rtable *rt)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct rtable *rt_intern_hash(unsigned hash, struct rtable *rt,
|
||||
static struct rtable *rt_intern_hash(unsigned int hash, struct rtable *rt,
|
||||
struct sk_buff *skb, int ifindex)
|
||||
{
|
||||
struct rtable *rth, *cand;
|
||||
|
|
@ -1384,7 +1384,7 @@ void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more)
|
|||
}
|
||||
EXPORT_SYMBOL(__ip_select_ident);
|
||||
|
||||
static void rt_del(unsigned hash, struct rtable *rt)
|
||||
static void rt_del(unsigned int hash, struct rtable *rt)
|
||||
{
|
||||
struct rtable __rcu **rthp;
|
||||
struct rtable *aux;
|
||||
|
|
@ -1538,7 +1538,7 @@ static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst)
|
|||
ip_rt_put(rt);
|
||||
ret = NULL;
|
||||
} else if (rt->rt_flags & RTCF_REDIRECTED) {
|
||||
unsigned hash = rt_hash(rt->rt_key_dst, rt->rt_key_src,
|
||||
unsigned int hash = rt_hash(rt->rt_key_dst, rt->rt_key_src,
|
||||
rt->rt_oif,
|
||||
rt_genid(dev_net(dst->dev)));
|
||||
rt_del(hash, rt);
|
||||
|
|
@ -2217,7 +2217,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
|
|||
{
|
||||
struct rtable *rth = NULL;
|
||||
int err;
|
||||
unsigned hash;
|
||||
unsigned int hash;
|
||||
|
||||
#ifdef CONFIG_IP_ROUTE_MULTIPATH
|
||||
if (res->fi && res->fi->fib_nhs > 1)
|
||||
|
|
@ -2255,10 +2255,10 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
|
|||
struct fib_result res;
|
||||
struct in_device *in_dev = __in_dev_get_rcu(dev);
|
||||
struct flowi4 fl4;
|
||||
unsigned flags = 0;
|
||||
unsigned int flags = 0;
|
||||
u32 itag = 0;
|
||||
struct rtable *rth;
|
||||
unsigned hash;
|
||||
unsigned int hash;
|
||||
__be32 spec_dst;
|
||||
int err = -EINVAL;
|
||||
struct net *net = dev_net(dev);
|
||||
|
|
@ -2434,7 +2434,7 @@ int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
|
|||
u8 tos, struct net_device *dev, bool noref)
|
||||
{
|
||||
struct rtable *rth;
|
||||
unsigned hash;
|
||||
unsigned int hash;
|
||||
int iif = dev->ifindex;
|
||||
struct net *net;
|
||||
int res;
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ static int ipv4_local_port_range(ctl_table *table, int write,
|
|||
static void inet_get_ping_group_range_table(struct ctl_table *table, gid_t *low, gid_t *high)
|
||||
{
|
||||
gid_t *data = table->data;
|
||||
unsigned seq;
|
||||
unsigned int seq;
|
||||
do {
|
||||
seq = read_seqbegin(&sysctl_local_ports.lock);
|
||||
|
||||
|
|
|
|||
|
|
@ -2675,7 +2675,7 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb,
|
|||
{
|
||||
struct sk_buff *segs = ERR_PTR(-EINVAL);
|
||||
struct tcphdr *th;
|
||||
unsigned thlen;
|
||||
unsigned int thlen;
|
||||
unsigned int seq;
|
||||
__be32 delta;
|
||||
unsigned int oldlen;
|
||||
|
|
@ -3033,8 +3033,8 @@ int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp,
|
|||
struct scatterlist sg;
|
||||
const struct tcphdr *tp = tcp_hdr(skb);
|
||||
struct hash_desc *desc = &hp->md5_desc;
|
||||
unsigned i;
|
||||
const unsigned head_data_len = skb_headlen(skb) > header_len ?
|
||||
unsigned int i;
|
||||
const unsigned int head_data_len = skb_headlen(skb) > header_len ?
|
||||
skb_headlen(skb) - header_len : 0;
|
||||
const struct skb_shared_info *shi = skb_shinfo(skb);
|
||||
struct sk_buff *frag_iter;
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ static void tcp_measure_rcv_mss(struct sock *sk, const struct sk_buff *skb)
|
|||
static void tcp_incr_quickack(struct sock *sk)
|
||||
{
|
||||
struct inet_connection_sock *icsk = inet_csk(sk);
|
||||
unsigned quickacks = tcp_sk(sk)->rcv_wnd / (2 * icsk->icsk_ack.rcv_mss);
|
||||
unsigned int quickacks = tcp_sk(sk)->rcv_wnd / (2 * icsk->icsk_ack.rcv_mss);
|
||||
|
||||
if (quickacks == 0)
|
||||
quickacks = 2;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue