diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-04-15 01:58:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-15 12:44:40 -0400 |
commit | 95c961747284a6b83a5e2d81240e214b0fa3464d (patch) | |
tree | c7be86a00db3605a48a03109fafcbe31039ca2e0 /net/phonet | |
parent | 5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9 (diff) |
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>
Diffstat (limited to 'net/phonet')
-rw-r--r-- | net/phonet/af_phonet.c | 2 | ||||
-rw-r--r-- | net/phonet/pep.c | 8 | ||||
-rw-r--r-- | net/phonet/pn_dev.c | 2 | ||||
-rw-r--r-- | net/phonet/socket.c | 12 | ||||
-rw-r--r-- | net/phonet/sysctl.c | 3 |
5 files changed, 14 insertions, 13 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index d65f699fbf34..779ce4ff92ec 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c | |||
@@ -129,7 +129,7 @@ static const struct net_proto_family phonet_proto_family = { | |||
129 | /* Phonet device header operations */ | 129 | /* Phonet device header operations */ |
130 | static int pn_header_create(struct sk_buff *skb, struct net_device *dev, | 130 | static int pn_header_create(struct sk_buff *skb, struct net_device *dev, |
131 | unsigned short type, const void *daddr, | 131 | unsigned short type, const void *daddr, |
132 | const void *saddr, unsigned len) | 132 | const void *saddr, unsigned int len) |
133 | { | 133 | { |
134 | u8 *media = skb_push(skb, 1); | 134 | u8 *media = skb_push(skb, 1); |
135 | 135 | ||
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 9726fe684ab8..9dd4f926f7d1 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c | |||
@@ -273,7 +273,7 @@ static int pipe_rcv_status(struct sock *sk, struct sk_buff *skb) | |||
273 | hdr = pnp_hdr(skb); | 273 | hdr = pnp_hdr(skb); |
274 | if (hdr->data[0] != PN_PEP_TYPE_COMMON) { | 274 | if (hdr->data[0] != PN_PEP_TYPE_COMMON) { |
275 | LIMIT_NETDEBUG(KERN_DEBUG"Phonet unknown PEP type: %u\n", | 275 | LIMIT_NETDEBUG(KERN_DEBUG"Phonet unknown PEP type: %u\n", |
276 | (unsigned)hdr->data[0]); | 276 | (unsigned int)hdr->data[0]); |
277 | return -EOPNOTSUPP; | 277 | return -EOPNOTSUPP; |
278 | } | 278 | } |
279 | 279 | ||
@@ -305,7 +305,7 @@ static int pipe_rcv_status(struct sock *sk, struct sk_buff *skb) | |||
305 | 305 | ||
306 | default: | 306 | default: |
307 | LIMIT_NETDEBUG(KERN_DEBUG"Phonet unknown PEP indication: %u\n", | 307 | LIMIT_NETDEBUG(KERN_DEBUG"Phonet unknown PEP indication: %u\n", |
308 | (unsigned)hdr->data[1]); | 308 | (unsigned int)hdr->data[1]); |
309 | return -EOPNOTSUPP; | 309 | return -EOPNOTSUPP; |
310 | } | 310 | } |
311 | if (wake) | 311 | if (wake) |
@@ -478,9 +478,9 @@ static void pipe_destruct(struct sock *sk) | |||
478 | skb_queue_purge(&pn->ctrlreq_queue); | 478 | skb_queue_purge(&pn->ctrlreq_queue); |
479 | } | 479 | } |
480 | 480 | ||
481 | static u8 pipe_negotiate_fc(const u8 *fcs, unsigned n) | 481 | static u8 pipe_negotiate_fc(const u8 *fcs, unsigned int n) |
482 | { | 482 | { |
483 | unsigned i; | 483 | unsigned int i; |
484 | u8 final_fc = PN_NO_FLOW_CONTROL; | 484 | u8 final_fc = PN_NO_FLOW_CONTROL; |
485 | 485 | ||
486 | for (i = 0; i < n; i++) { | 486 | for (i = 0; i < n; i++) { |
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index da564efe4f5b..36f75a9e2c3d 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c | |||
@@ -268,7 +268,7 @@ static int phonet_device_autoconf(struct net_device *dev) | |||
268 | static void phonet_route_autodel(struct net_device *dev) | 268 | static void phonet_route_autodel(struct net_device *dev) |
269 | { | 269 | { |
270 | struct phonet_net *pnn = phonet_pernet(dev_net(dev)); | 270 | struct phonet_net *pnn = phonet_pernet(dev_net(dev)); |
271 | unsigned i; | 271 | unsigned int i; |
272 | DECLARE_BITMAP(deleted, 64); | 272 | DECLARE_BITMAP(deleted, 64); |
273 | 273 | ||
274 | /* Remove left-over Phonet routes */ | 274 | /* Remove left-over Phonet routes */ |
diff --git a/net/phonet/socket.c b/net/phonet/socket.c index 4c7eff30dfa9..89cfa9ce4939 100644 --- a/net/phonet/socket.c +++ b/net/phonet/socket.c | |||
@@ -58,7 +58,7 @@ static struct { | |||
58 | 58 | ||
59 | void __init pn_sock_init(void) | 59 | void __init pn_sock_init(void) |
60 | { | 60 | { |
61 | unsigned i; | 61 | unsigned int i; |
62 | 62 | ||
63 | for (i = 0; i < PN_HASHSIZE; i++) | 63 | for (i = 0; i < PN_HASHSIZE; i++) |
64 | INIT_HLIST_HEAD(pnsocks.hlist + i); | 64 | INIT_HLIST_HEAD(pnsocks.hlist + i); |
@@ -116,7 +116,7 @@ struct sock *pn_find_sock_by_sa(struct net *net, const struct sockaddr_pn *spn) | |||
116 | void pn_deliver_sock_broadcast(struct net *net, struct sk_buff *skb) | 116 | void pn_deliver_sock_broadcast(struct net *net, struct sk_buff *skb) |
117 | { | 117 | { |
118 | struct hlist_head *hlist = pnsocks.hlist; | 118 | struct hlist_head *hlist = pnsocks.hlist; |
119 | unsigned h; | 119 | unsigned int h; |
120 | 120 | ||
121 | rcu_read_lock(); | 121 | rcu_read_lock(); |
122 | for (h = 0; h < PN_HASHSIZE; h++) { | 122 | for (h = 0; h < PN_HASHSIZE; h++) { |
@@ -545,7 +545,7 @@ static struct sock *pn_sock_get_idx(struct seq_file *seq, loff_t pos) | |||
545 | struct hlist_head *hlist = pnsocks.hlist; | 545 | struct hlist_head *hlist = pnsocks.hlist; |
546 | struct hlist_node *node; | 546 | struct hlist_node *node; |
547 | struct sock *sknode; | 547 | struct sock *sknode; |
548 | unsigned h; | 548 | unsigned int h; |
549 | 549 | ||
550 | for (h = 0; h < PN_HASHSIZE; h++) { | 550 | for (h = 0; h < PN_HASHSIZE; h++) { |
551 | sk_for_each_rcu(sknode, node, hlist) { | 551 | sk_for_each_rcu(sknode, node, hlist) { |
@@ -710,7 +710,7 @@ int pn_sock_unbind_res(struct sock *sk, u8 res) | |||
710 | 710 | ||
711 | void pn_sock_unbind_all_res(struct sock *sk) | 711 | void pn_sock_unbind_all_res(struct sock *sk) |
712 | { | 712 | { |
713 | unsigned res, match = 0; | 713 | unsigned int res, match = 0; |
714 | 714 | ||
715 | mutex_lock(&resource_mutex); | 715 | mutex_lock(&resource_mutex); |
716 | for (res = 0; res < 256; res++) { | 716 | for (res = 0; res < 256; res++) { |
@@ -732,7 +732,7 @@ void pn_sock_unbind_all_res(struct sock *sk) | |||
732 | static struct sock **pn_res_get_idx(struct seq_file *seq, loff_t pos) | 732 | static struct sock **pn_res_get_idx(struct seq_file *seq, loff_t pos) |
733 | { | 733 | { |
734 | struct net *net = seq_file_net(seq); | 734 | struct net *net = seq_file_net(seq); |
735 | unsigned i; | 735 | unsigned int i; |
736 | 736 | ||
737 | if (!net_eq(net, &init_net)) | 737 | if (!net_eq(net, &init_net)) |
738 | return NULL; | 738 | return NULL; |
@@ -750,7 +750,7 @@ static struct sock **pn_res_get_idx(struct seq_file *seq, loff_t pos) | |||
750 | static struct sock **pn_res_get_next(struct seq_file *seq, struct sock **sk) | 750 | static struct sock **pn_res_get_next(struct seq_file *seq, struct sock **sk) |
751 | { | 751 | { |
752 | struct net *net = seq_file_net(seq); | 752 | struct net *net = seq_file_net(seq); |
753 | unsigned i; | 753 | unsigned int i; |
754 | 754 | ||
755 | BUG_ON(!net_eq(net, &init_net)); | 755 | BUG_ON(!net_eq(net, &init_net)); |
756 | 756 | ||
diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c index 740bf209dd97..8bed7675b3f4 100644 --- a/net/phonet/sysctl.c +++ b/net/phonet/sysctl.c | |||
@@ -50,7 +50,8 @@ static void set_local_port_range(int range[2]) | |||
50 | 50 | ||
51 | void phonet_get_local_port_range(int *min, int *max) | 51 | void phonet_get_local_port_range(int *min, int *max) |
52 | { | 52 | { |
53 | unsigned seq; | 53 | unsigned int seq; |
54 | |||
54 | do { | 55 | do { |
55 | seq = read_seqbegin(&local_port_range_lock); | 56 | seq = read_seqbegin(&local_port_range_lock); |
56 | if (min) | 57 | if (min) |