fix up misplaced inlines.
Subsystems (9)
Turning up the warnings on gcc makes it emit warnings about the placement of 'inline' in function declarations. Here's everything that was under net/
Signed-off-by Dave Jones <[email protected]>
net/bluetooth/hidp/core.c +1 -1
@@ -319,7 +319,7 @@ static int __hidp_send_ctrl_message(struct hidp_session *session,return 0 ; } -static int inline hidp_send_ctrl_message (struct hidp_session *session, +static inline int hidp_send_ctrl_message (struct hidp_session *session,unsigned char hdr,unsigned char *data,int size) {int err;
net/bridge/br_netfilter.c +1 -1
@@ -61,7 +61,7 @@ static int brnf_filter_vlan_tagged __read_mostly = 1;#define brnf_filter_vlan_tagged 1#endif -static __be16 inline vlan_proto (const struct sk_buff *skb) +static inline __be16 vlan_proto (const struct sk_buff *skb) {return vlan_eth_hdr (skb)->h_vlan_encapsulated_proto; }
net/core/sock.c +1 -1
@@ -808,7 +808,7 @@ lenout:* * (We also register the sk_lock with the lock validator.) */ -static void inline sock_lock_init (struct sock *sk) +static inline void sock_lock_init (struct sock *sk) { sock_lock_init_class_and_name(sk, af_family_slock_key_strings[sk->sk_family],
net/ipv6/addrconf.c +3 -3
@@ -804,7 +804,7 @@ struct ipv6_saddr_score {#define IPV6_SADDR_SCORE_LABEL 0x0020#define IPV6_SADDR_SCORE_PRIVACY 0x0040 -static int inline ipv6_saddr_preferred (int type) +static inline int ipv6_saddr_preferred (int type) {if (type & (IPV6_ADDR_MAPPED |IPV6_ADDR_COMPATv4|IPV6_ADDR_LOOPBACK |IPV6_ADDR_RESERVED ))
@@ -813,7 +813,7 @@ static int inline ipv6_saddr_preferred(int type) }/* static matching label */ -static int inline ipv6_saddr_label (const struct in6_addr *addr,int type) +static inline int ipv6_saddr_label (const struct in6_addr *addr,int type) {/* * prefix (longest match) label
@@ -3318,7 +3318,7 @@ errout:rtnl_set_sk_err (RTNLGRP_IPV6_IFADDR , err); } -static void inline ipv6_store_devconf (struct ipv6_devconf *cnf, +static inline void ipv6_store_devconf (struct ipv6_devconf *cnf,__s32 *array,int bytes) {BUG_ON (bytes < (DEVCONF_MAX *4 ));
net/ipv6/route.c +2 -2
@@ -308,7 +308,7 @@ static inline void rt6_probe(struct rt6_info *rt)/* * Default Router Selection (RFC 2461 6.3.6) */ -static int inline rt6_check_dev (struct rt6_info *rt,int oif) +static inline int rt6_check_dev (struct rt6_info *rt,int oif) {struct net_device *dev = rt->rt6i_dev;int ret =0 ;
@@ -328,7 +328,7 @@ static int inline rt6_check_dev(struct rt6_info *rt, int oif)return ret; } -static int inline rt6_check_neigh (struct rt6_info *rt) +static inline int rt6_check_neigh (struct rt6_info *rt) {struct neighbour *neigh = rt->rt6i_nexthop;int m =0 ;
net/ipv6/xfrm6_tunnel.c +2 -2
@@ -58,7 +58,7 @@ static struct kmem_cache *xfrm6_tunnel_spi_kmem __read_mostly;static struct hlist_head xfrm6_tunnel_spi_byaddr[XFRM6_TUNNEL_SPI_BYADDR_HSIZE ];static struct hlist_head xfrm6_tunnel_spi_byspi[XFRM6_TUNNEL_SPI_BYSPI_HSIZE ]; -static unsigned inline xfrm6_tunnel_spi_hash_byaddr (xfrm_address_t *addr) +static inline unsigned xfrm6_tunnel_spi_hash_byaddr (xfrm_address_t *addr) {unsigned h;
@@ -70,7 +70,7 @@ static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr)return h; } -static unsigned inline xfrm6_tunnel_spi_hash_byspi (u32 spi) +static inline unsigned xfrm6_tunnel_spi_hash_byspi (u32 spi) {return spi %XFRM6_TUNNEL_SPI_BYSPI_HSIZE ; }
net/sched/cls_route.c +1 -1
@@ -93,7 +93,7 @@ void route4_reset_fastmap(struct net_device *dev, struct route4_head *head, u32spin_unlock_bh (&dev->queue_lock); } -static void __inline__ +static inline void route4_set_fastmap (struct route4_head *head,u32 id,int iif,struct route4_filter *f) {
net/xfrm/xfrm_user.c +1 -1
@@ -2025,7 +2025,7 @@ nlmsg_failure:return -1 ; } -static int inline xfrm_sa_len (struct xfrm_state *x) +static inline int xfrm_sa_len (struct xfrm_state *x) {int l =0 ;if (x->aalg)
Signature · 1 line
http://www.codemonkey.org.uk
From: Dave Jones <[email protected]>
Date: Wed, 21 Mar 2007 20:18:28 -0400
Quoted 5 lines
Turning up the warnings on gcc makes it emit warnings about the placement of 'inline' in function declarations. Here's everything that was under
net/Signed-off-by Dave Jones <[email protected]>
Applied, thanks a lot Dave.