Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6f99a21 authored by Dave Jones's avatar Dave Jones Committed by David S. Miller
Browse files

[NET]: fix up misplaced inlines. 



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: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 289f4249

net/bluetooth/hidp/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, 
 *

 * (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
Original line number Diff line number Diff line
@@ -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 @@ static void inet6_ifa_notify(int event, struct inet6_ifaddr *ifa) 
		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
Original line number Diff line number Diff line
@@ -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;