diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/addrconf.c | 6 | ||||
-rw-r--r-- | net/ipv6/route.c | 4 | ||||
-rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index a7fee6b27320..1b616992d916 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -804,7 +804,7 @@ struct ipv6_saddr_score { | |||
804 | #define IPV6_SADDR_SCORE_LABEL 0x0020 | 804 | #define IPV6_SADDR_SCORE_LABEL 0x0020 |
805 | #define IPV6_SADDR_SCORE_PRIVACY 0x0040 | 805 | #define IPV6_SADDR_SCORE_PRIVACY 0x0040 |
806 | 806 | ||
807 | static int inline ipv6_saddr_preferred(int type) | 807 | static inline int ipv6_saddr_preferred(int type) |
808 | { | 808 | { |
809 | if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4| | 809 | if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4| |
810 | IPV6_ADDR_LOOPBACK|IPV6_ADDR_RESERVED)) | 810 | IPV6_ADDR_LOOPBACK|IPV6_ADDR_RESERVED)) |
@@ -813,7 +813,7 @@ static int inline ipv6_saddr_preferred(int type) | |||
813 | } | 813 | } |
814 | 814 | ||
815 | /* static matching label */ | 815 | /* static matching label */ |
816 | static int inline ipv6_saddr_label(const struct in6_addr *addr, int type) | 816 | static inline int ipv6_saddr_label(const struct in6_addr *addr, int type) |
817 | { | 817 | { |
818 | /* | 818 | /* |
819 | * prefix (longest match) label | 819 | * prefix (longest match) label |
@@ -3318,7 +3318,7 @@ errout: | |||
3318 | rtnl_set_sk_err(RTNLGRP_IPV6_IFADDR, err); | 3318 | rtnl_set_sk_err(RTNLGRP_IPV6_IFADDR, err); |
3319 | } | 3319 | } |
3320 | 3320 | ||
3321 | static void inline ipv6_store_devconf(struct ipv6_devconf *cnf, | 3321 | static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, |
3322 | __s32 *array, int bytes) | 3322 | __s32 *array, int bytes) |
3323 | { | 3323 | { |
3324 | BUG_ON(bytes < (DEVCONF_MAX * 4)); | 3324 | BUG_ON(bytes < (DEVCONF_MAX * 4)); |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 0e1f4b2cd3dd..a6b3117df546 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -308,7 +308,7 @@ static inline void rt6_probe(struct rt6_info *rt) | |||
308 | /* | 308 | /* |
309 | * Default Router Selection (RFC 2461 6.3.6) | 309 | * Default Router Selection (RFC 2461 6.3.6) |
310 | */ | 310 | */ |
311 | static int inline rt6_check_dev(struct rt6_info *rt, int oif) | 311 | static inline int rt6_check_dev(struct rt6_info *rt, int oif) |
312 | { | 312 | { |
313 | struct net_device *dev = rt->rt6i_dev; | 313 | struct net_device *dev = rt->rt6i_dev; |
314 | int ret = 0; | 314 | int ret = 0; |
@@ -328,7 +328,7 @@ static int inline rt6_check_dev(struct rt6_info *rt, int oif) | |||
328 | return ret; | 328 | return ret; |
329 | } | 329 | } |
330 | 330 | ||
331 | static int inline rt6_check_neigh(struct rt6_info *rt) | 331 | static inline int rt6_check_neigh(struct rt6_info *rt) |
332 | { | 332 | { |
333 | struct neighbour *neigh = rt->rt6i_nexthop; | 333 | struct neighbour *neigh = rt->rt6i_nexthop; |
334 | int m = 0; | 334 | int m = 0; |
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index ee4b84a33ff4..93c42232aa39 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -58,7 +58,7 @@ static struct kmem_cache *xfrm6_tunnel_spi_kmem __read_mostly; | |||
58 | static struct hlist_head xfrm6_tunnel_spi_byaddr[XFRM6_TUNNEL_SPI_BYADDR_HSIZE]; | 58 | static struct hlist_head xfrm6_tunnel_spi_byaddr[XFRM6_TUNNEL_SPI_BYADDR_HSIZE]; |
59 | static struct hlist_head xfrm6_tunnel_spi_byspi[XFRM6_TUNNEL_SPI_BYSPI_HSIZE]; | 59 | static struct hlist_head xfrm6_tunnel_spi_byspi[XFRM6_TUNNEL_SPI_BYSPI_HSIZE]; |
60 | 60 | ||
61 | static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr) | 61 | static inline unsigned xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr) |
62 | { | 62 | { |
63 | unsigned h; | 63 | unsigned h; |
64 | 64 | ||
@@ -70,7 +70,7 @@ static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr) | |||
70 | return h; | 70 | return h; |
71 | } | 71 | } |
72 | 72 | ||
73 | static unsigned inline xfrm6_tunnel_spi_hash_byspi(u32 spi) | 73 | static inline unsigned xfrm6_tunnel_spi_hash_byspi(u32 spi) |
74 | { | 74 | { |
75 | return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE; | 75 | return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE; |
76 | } | 76 | } |