Permalink
Browse files

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>
  • Loading branch information...
1 parent 5e73ea1 commit 95c961747284a6b83a5e2d81240e214b0fa3464d Eric Dumazet committed with davem330 Apr 15, 2012
Showing with 461 additions and 455 deletions.
  1. +6 −6 include/linux/ip_vs.h
  2. +7 −7 include/linux/netdevice.h
  3. +4 −4 include/linux/netfilter/ipset/ip_set.h
  4. +6 −6 include/linux/netfilter/nf_conntrack_h323_types.h
  5. +1 −1 include/linux/netfilter/nfnetlink.h
  6. +2 −2 include/linux/socket.h
  7. +1 −1 include/net/addrconf.h
  8. +1 −1 include/net/af_unix.h
  9. +4 −4 include/net/compat.h
  10. +1 −1 include/net/dn.h
  11. +3 −3 include/net/dn_fib.h
  12. +2 −2 include/net/dn_route.h
  13. +1 −1 include/net/dst_ops.h
  14. +1 −1 include/net/icmp.h
  15. +1 −1 include/net/if_inet6.h
  16. +1 −1 include/net/ip6_route.h
  17. +2 −2 include/net/ip_fib.h
  18. +8 −8 include/net/ip_vs.h
  19. +1 −1 include/net/ipv6.h
  20. +1 −1 include/net/llc_c_ev.h
  21. +2 −2 include/net/neighbour.h
  22. +1 −1 include/net/netns/hash.h
  23. +1 −1 include/net/nfc/nfc.h
  24. +1 −1 include/net/pkt_sched.h
  25. +3 −3 include/net/route.h
  26. +4 −4 include/net/sctp/structs.h
  27. +1 −1 include/net/tcp.h
  28. +1 −1 include/net/udp.h
  29. +2 −2 include/net/wimax.h
  30. +1 −1 include/net/x25.h
  31. +1 −1 net/802/fc.c
  32. +1 −1 net/802/fddi.c
  33. +1 −1 net/802/hippi.c
  34. +2 −2 net/802/tr.c
  35. +3 −3 net/9p/client.c
  36. +1 −1 net/9p/trans_fd.c
  37. +1 −1 net/atm/br2684.c
  38. +1 −1 net/atm/mpoa_proc.c
  39. +1 −1 net/atm/signaling.c
  40. +2 −2 net/ax25/ax25_ip.c
  41. +3 −3 net/batman-adv/bat_sysfs.c
  42. +1 −1 net/bridge/br_forward.c
  43. +5 −5 net/bridge/br_multicast.c
  44. +1 −1 net/bridge/br_netlink.c
  45. +3 −4 net/bridge/br_private_stp.h
  46. +2 −2 net/bridge/br_stp.c
  47. +3 −3 net/bridge/br_stp_timer.c
  48. +1 −1 net/bridge/br_sysfs_br.c
  49. +1 −1 net/caif/caif_socket.c
  50. +3 −3 net/ceph/auth_x.h
  51. +2 −2 net/ceph/ceph_common.c
  52. +3 −3 net/ceph/ceph_hash.c
  53. +4 −4 net/ceph/crush/mapper.c
  54. +3 −3 net/ceph/debugfs.c
  55. +8 −8 net/ceph/messenger.c
  56. +5 −5 net/ceph/mon_client.c
  57. +1 −1 net/ceph/osd_client.c
  58. +7 −7 net/ceph/osdmap.c
  59. +5 −5 net/compat.c
  60. +3 −3 net/core/datagram.c
  61. +4 −3 net/core/dev.c
  62. +1 −1 net/core/filter.c
  63. +1 −1 net/core/neighbour.c
  64. +4 −4 net/core/net-sysfs.c
  65. +10 −10 net/core/pktgen.c
  66. +3 −3 net/core/rtnetlink.c
  67. +1 −1 net/core/skbuff.c
  68. +1 −1 net/core/sock.c
  69. +6 −6 net/dccp/ccids/ccid3.c
  70. +4 −4 net/dccp/dccp.h
  71. +5 −5 net/dccp/input.c
  72. +3 −3 net/decnet/af_decnet.c
  73. +3 −2 net/decnet/dn_fib.c
  74. +1 −1 net/decnet/dn_nsp_in.c
  75. +2 −2 net/decnet/dn_nsp_out.c
  76. +9 −9 net/decnet/dn_route.c
  77. +2 −2 net/decnet/dn_rules.c
  78. +1 −1 net/dns_resolver/dns_key.c
  79. +1 −1 net/dns_resolver/internal.h
  80. +1 −1 net/ethernet/eth.c
  81. +1 −1 net/ieee802154/6lowpan.c
  82. +3 −3 net/ieee802154/dgram.c
  83. +1 −1 net/ieee802154/raw.c
  84. +2 −2 net/ipv4/arp.c
  85. +1 −1 net/ipv4/devinet.c
  86. +5 −5 net/ipv4/fib_frontend.c
  87. +2 −1 net/ipv4/inet_connection_sock.c
  88. +1 −1 net/ipv4/inet_timewait_sock.c
  89. +1 −1 net/ipv4/ip_options.c
  90. +2 −2 net/ipv4/ip_sockglue.c
  91. +1 −1 net/ipv4/ipconfig.c
  92. +1 −1 net/ipv4/netfilter.c
  93. +1 −1 net/ipv4/netfilter/arp_tables.c
  94. +1 −1 net/ipv4/netfilter/ip_tables.c
  95. +1 −1 net/ipv4/netfilter/nf_nat_sip.c
  96. +5 −3 net/ipv4/ping.c
  97. +10 −10 net/ipv4/route.c
  98. +1 −1 net/ipv4/sysctl_net_ipv4.c
  99. +4 −4 net/ipv4/tcp.c
  100. +1 −1 net/ipv4/tcp_input.c
  101. +12 −12 net/ipv4/tcp_output.c
  102. +1 −1 net/ipv4/tcp_probe.c
  103. +1 −1 net/ipv4/udp.c
  104. +1 −1 net/ipv6/addrconf_core.c
  105. +1 −1 net/ipv6/datagram.c
  106. +2 −2 net/ipv6/ip6_flowlabel.c
  107. +1 −1 net/ipv6/ip6_tunnel.c
  108. +1 −1 net/ipv6/ipv6_sockglue.c
  109. +1 −1 net/ipv6/netfilter/ip6_tables.c
  110. +5 −6 net/ipv6/route.c
  111. +3 −3 net/ipv6/xfrm6_tunnel.c
  112. +1 −1 net/irda/ircomm/ircomm_tty_ioctl.c
  113. +2 −2 net/key/af_key.c
  114. +8 −8 net/l2tp/l2tp_core.h
  115. +1 −1 net/llc/af_llc.c
  116. +3 −3 net/netfilter/ipset/ip_set_core.c
  117. +1 −1 net/netfilter/ipvs/ip_vs_app.c
  118. +17 −17 net/netfilter/ipvs/ip_vs_conn.c
  119. +1 −1 net/netfilter/ipvs/ip_vs_core.c
  120. +13 −13 net/netfilter/ipvs/ip_vs_ctl.c
  121. +1 −1 net/netfilter/ipvs/ip_vs_dh.c
  122. +1 −1 net/netfilter/ipvs/ip_vs_ftp.c
  123. +3 −3 net/netfilter/ipvs/ip_vs_lblc.c
  124. +3 −3 net/netfilter/ipvs/ip_vs_lblcr.c
  125. +6 −6 net/netfilter/ipvs/ip_vs_proto.c
  126. +1 −1 net/netfilter/ipvs/ip_vs_sh.c
  127. +2 −2 net/netfilter/ipvs/ip_vs_sync.c
  128. +1 −1 net/netfilter/nf_conntrack_h323_main.c
  129. +1 −1 net/netfilter/nfnetlink.c
  130. +1 −1 net/netfilter/xt_recent.c
  131. +1 −1 net/netrom/nr_dev.c
  132. +2 −2 net/nfc/core.c
  133. +1 −1 net/nfc/nfc.h
  134. +2 −2 net/openvswitch/vport-netdev.c
  135. +1 −1 net/packet/af_packet.c
  136. +1 −1 net/phonet/af_phonet.c
  137. +4 −4 net/phonet/pep.c
  138. +1 −1 net/phonet/pn_dev.c
  139. +6 −6 net/phonet/socket.c
  140. +2 −1 net/phonet/sysctl.c
  141. +1 −1 net/rose/rose_dev.c
  142. +1 −1 net/rose/rose_subr.c
  143. +4 −4 net/rxrpc/af_rxrpc.c
  144. +3 −3 net/rxrpc/ar-ack.c
  145. +2 −2 net/rxrpc/ar-call.c
  146. +1 −1 net/rxrpc/ar-input.c
  147. +8 −8 net/rxrpc/ar-internal.h
  148. +11 −11 net/rxrpc/ar-key.c
  149. +3 −3 net/rxrpc/rxkad.c
  150. +2 −2 net/sctp/associola.c
  151. +2 −2 net/sctp/output.c
  152. +1 −1 net/sctp/outqueue.c
  153. +2 −2 net/sctp/sm_sideeffect.c
  154. +2 −2 net/sctp/sm_statefuns.c
  155. +9 −9 net/socket.c
  156. +1 −1 net/sunrpc/auth_gss/gss_krb5_mech.c
  157. +1 −1 net/sunrpc/cache.c
  158. +3 −3 net/sunrpc/timer.c
  159. +1 −1 net/sunrpc/xdr.c
  160. +1 −1 net/sunrpc/xprt.c
  161. +1 −1 net/tipc/link.c
  162. +4 −4 net/tipc/socket.c
  163. +11 −10 net/unix/af_unix.c
  164. +3 −2 net/wimax/stack.c
  165. +3 −3 net/wireless/wext-core.c
  166. +2 −2 net/x25/x25_facilities.c
  167. +4 −4 net/xfrm/xfrm_hash.h
View
@@ -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 *);
View
@@ -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);
View
@@ -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;
View
@@ -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);
View
@@ -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;
Oops, something went wrong. Retry.

0 comments on commit 95c9617

Please sign in to comment.