Commit 95c96174 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: cleanup unsigned to unsigned int 



Use of "unsigned int" is preferred to bare "unsigned" in net tree.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e73ea1a

include/linux/ip_vs.h

+6 −6
Original line number Diff line number Diff line
@@ -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 */

include/linux/netdevice.h

+7 −7
Original line number Diff line number Diff line
@@ -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);

include/linux/netfilter/ipset/ip_set.h

+4 −4
Original line number Diff line number Diff line
@@ -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 */

include/linux/netfilter/nf_conntrack_h323_types.h

+6 −6
Original line number Diff line number Diff line
@@ -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 */

include/linux/netfilter/nfnetlink.h

+1 −1
Original line number Diff line number Diff line
@@ -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);