aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-07 20:45:32 -0500
committerDavid S. Miller <davem@davemloft.net>2012-03-09 17:34:50 -0500
commitba57b4db2624793c6eb8f2c051c9f7b8a6e7b6a6 (patch)
tree67823715c9c24e2fd0bfa2bb7393d3e0e08eadb1
parentb2d3298e0916fa059712691c85a0e97becc4ab9f (diff)
ipv4: Make ip_call_ra_chain() return bool.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/ip.h2
-rw-r--r--net/ipv4/ip_input.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index 775009f9eaba..b53d65f24f7b 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -388,7 +388,7 @@ static inline int sk_mc_loop(struct sock *sk)
388 return 1; 388 return 1;
389} 389}
390 390
391extern int ip_call_ra_chain(struct sk_buff *skb); 391extern bool ip_call_ra_chain(struct sk_buff *skb);
392 392
393/* 393/*
394 * Functions provided by ip_fragment.c 394 * Functions provided by ip_fragment.c
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 073a9b01c40c..70afe5bf1945 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -148,7 +148,7 @@
148/* 148/*
149 * Process Router Attention IP option (RFC 2113) 149 * Process Router Attention IP option (RFC 2113)
150 */ 150 */
151int ip_call_ra_chain(struct sk_buff *skb) 151bool ip_call_ra_chain(struct sk_buff *skb)
152{ 152{
153 struct ip_ra_chain *ra; 153 struct ip_ra_chain *ra;
154 u8 protocol = ip_hdr(skb)->protocol; 154 u8 protocol = ip_hdr(skb)->protocol;
@@ -167,7 +167,7 @@ int ip_call_ra_chain(struct sk_buff *skb)
167 net_eq(sock_net(sk), dev_net(dev))) { 167 net_eq(sock_net(sk), dev_net(dev))) {
168 if (ip_is_fragment(ip_hdr(skb))) { 168 if (ip_is_fragment(ip_hdr(skb))) {
169 if (ip_defrag(skb, IP_DEFRAG_CALL_RA_CHAIN)) 169 if (ip_defrag(skb, IP_DEFRAG_CALL_RA_CHAIN))
170 return 1; 170 return true;
171 } 171 }
172 if (last) { 172 if (last) {
173 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC); 173 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
@@ -180,9 +180,9 @@ int ip_call_ra_chain(struct sk_buff *skb)
180 180
181 if (last) { 181 if (last) {
182 raw_rcv(last, skb); 182 raw_rcv(last, skb);
183 return 1; 183 return true;
184 } 184 }
185 return 0; 185 return false;
186} 186}
187 187
188static int ip_local_deliver_finish(struct sk_buff *skb) 188static int ip_local_deliver_finish(struct sk_buff *skb)