* [patch 01/14] replace __inline__ by inline in net/ipv4
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 02/14] replace __inline__ by inline in net/ipv6 Daniel Lezcano
` (13 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-ipv4.patch --]
[-- Type: text/plain, Size: 8195 bytes --]
replace __inline__ by inline in net/ipv4
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/ipv4/devinet.c | 2 +-
net/ipv4/fib_semantics.c | 2 +-
net/ipv4/igmp.c | 2 +-
net/ipv4/ip_fragment.c | 8 ++++----
net/ipv4/ip_output.c | 2 +-
net/ipv4/ipvs/ip_vs_ctl.c | 15 ++++++++-------
net/ipv4/raw.c | 2 +-
net/ipv4/route.c | 10 +++++-----
net/ipv4/tcp_minisocks.c | 2 +-
net/ipv4/tcp_output.c | 5 +++--
10 files changed, 26 insertions(+), 24 deletions(-)
Index: net-2.6/net/ipv4/devinet.c
===================================================================
--- net-2.6.orig/net/ipv4/devinet.c
+++ net-2.6/net/ipv4/devinet.c
@@ -574,7 +574,7 @@ static int inet_rtm_newaddr(struct sk_bu
* Determine a default network mask, based on the IP address.
*/
-static __inline__ int inet_abc_len(__be32 addr)
+static inline int inet_abc_len(__be32 addr)
{
int rc = -1; /* Something else, probably a multicast. */
Index: net-2.6/net/ipv4/fib_semantics.c
===================================================================
--- net-2.6.orig/net/ipv4/fib_semantics.c
+++ net-2.6/net/ipv4/fib_semantics.c
@@ -173,7 +173,7 @@ void fib_release_info(struct fib_info *f
spin_unlock_bh(&fib_info_lock);
}
-static __inline__ int nh_comp(const struct fib_info *fi, const struct fib_info *ofi)
+static inline int nh_comp(const struct fib_info *fi, const struct fib_info *ofi)
{
const struct fib_nh *onh = ofi->fib_nh;
Index: net-2.6/net/ipv4/igmp.c
===================================================================
--- net-2.6.orig/net/ipv4/igmp.c
+++ net-2.6/net/ipv4/igmp.c
@@ -164,7 +164,7 @@ static void ip_ma_put(struct ip_mc_list
* Timer management
*/
-static __inline__ void igmp_stop_timer(struct ip_mc_list *im)
+static inline void igmp_stop_timer(struct ip_mc_list *im)
{
spin_lock_bh(&im->lock);
if (del_timer(&im->timer))
Index: net-2.6/net/ipv4/ip_fragment.c
===================================================================
--- net-2.6.orig/net/ipv4/ip_fragment.c
+++ net-2.6/net/ipv4/ip_fragment.c
@@ -123,8 +123,8 @@ static int ip4_frag_match(struct inet_fr
}
/* Memory Tracking Functions. */
-static __inline__ void frag_kfree_skb(struct netns_frags *nf,
- struct sk_buff *skb, int *work)
+static inline void frag_kfree_skb(struct netns_frags *nf,
+ struct sk_buff *skb, int *work)
{
if (work)
*work -= skb->truesize;
@@ -146,7 +146,7 @@ static void ip4_frag_init(struct inet_fr
inet_getpeer(arg->iph->saddr, 1) : NULL;
}
-static __inline__ void ip4_frag_free(struct inet_frag_queue *q)
+static inline void ip4_frag_free(struct inet_frag_queue *q)
{
struct ipq *qp;
@@ -158,7 +158,7 @@ static __inline__ void ip4_frag_free(str
/* Destruction primitives. */
-static __inline__ void ipq_put(struct ipq *ipq)
+static inline void ipq_put(struct ipq *ipq)
{
inet_frag_put(&ipq->q, &ip4_frags);
}
Index: net-2.6/net/ipv4/ip_output.c
===================================================================
--- net-2.6.orig/net/ipv4/ip_output.c
+++ net-2.6/net/ipv4/ip_output.c
@@ -85,7 +85,7 @@
int sysctl_ip_default_ttl __read_mostly = IPDEFTTL;
/* Generate a checksum for an outgoing IP datagram. */
-__inline__ void ip_send_check(struct iphdr *iph)
+inline void ip_send_check(struct iphdr *iph)
{
iph->check = 0;
iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
Index: net-2.6/net/ipv4/raw.c
===================================================================
--- net-2.6.orig/net/ipv4/raw.c
+++ net-2.6/net/ipv4/raw.c
@@ -139,7 +139,7 @@ found:
* 0 - deliver
* 1 - block
*/
-static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb)
+static inline int icmp_filter(struct sock *sk, struct sk_buff *skb)
{
int type;
Index: net-2.6/net/ipv4/route.c
===================================================================
--- net-2.6.orig/net/ipv4/route.c
+++ net-2.6/net/ipv4/route.c
@@ -572,18 +572,18 @@ static inline int ip_rt_proc_init(struct
}
#endif /* CONFIG_PROC_FS */
-static __inline__ void rt_free(struct rtable *rt)
+static inline void rt_free(struct rtable *rt)
{
call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);
}
-static __inline__ void rt_drop(struct rtable *rt)
+static inline void rt_drop(struct rtable *rt)
{
ip_rt_put(rt);
call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);
}
-static __inline__ int rt_fast_clean(struct rtable *rth)
+static inline int rt_fast_clean(struct rtable *rth)
{
/* Kill broadcast/multicast entries very aggresively, if they
collide in hash table with more useful entries */
@@ -591,7 +591,7 @@ static __inline__ int rt_fast_clean(stru
rth->fl.iif && rth->u.dst.rt_next;
}
-static __inline__ int rt_valuable(struct rtable *rth)
+static inline int rt_valuable(struct rtable *rth)
{
return (rth->rt_flags & (RTCF_REDIRECTED | RTCF_NOTIFY)) ||
rth->u.dst.expires;
@@ -1389,7 +1389,7 @@ out: kfree_skb(skb);
static const unsigned short mtu_plateau[] =
{32000, 17914, 8166, 4352, 2002, 1492, 576, 296, 216, 128 };
-static __inline__ unsigned short guess_mtu(unsigned short old_mtu)
+static inline unsigned short guess_mtu(unsigned short old_mtu)
{
int i;
Index: net-2.6/net/ipv4/tcp_minisocks.c
===================================================================
--- net-2.6.orig/net/ipv4/tcp_minisocks.c
+++ net-2.6/net/ipv4/tcp_minisocks.c
@@ -55,7 +55,7 @@ struct inet_timewait_death_row tcp_death
EXPORT_SYMBOL_GPL(tcp_death_row);
-static __inline__ int tcp_in_window(u32 seq, u32 end_seq, u32 s_win, u32 e_win)
+static inline int tcp_in_window(u32 seq, u32 end_seq, u32 s_win, u32 e_win)
{
if (seq == s_win)
return 1;
Index: net-2.6/net/ipv4/tcp_output.c
===================================================================
--- net-2.6.orig/net/ipv4/tcp_output.c
+++ net-2.6/net/ipv4/tcp_output.c
@@ -1,3 +1,4 @@
+
/*
* INET An implementation of the TCP/IP protocol suite for the LINUX
* operating system. INET is implemented using the BSD Socket
@@ -296,8 +297,8 @@ static inline void TCP_ECN_send_syn(stru
}
}
-static __inline__ void
-TCP_ECN_make_synack(struct request_sock *req, struct tcphdr *th)
+static inline void TCP_ECN_make_synack(struct request_sock *req,
+ struct tcphdr *th)
{
if (inet_rsk(req)->ecn_ok)
th->ece = 1;
Index: net-2.6/net/ipv4/ipvs/ip_vs_ctl.c
===================================================================
--- net-2.6.orig/net/ipv4/ipvs/ip_vs_ctl.c
+++ net-2.6/net/ipv4/ipvs/ip_vs_ctl.c
@@ -282,8 +282,8 @@ static atomic_t ip_vs_nullsvc_counter =
/*
* Returns hash value for virtual service
*/
-static __inline__ unsigned
-ip_vs_svc_hashkey(unsigned proto, __be32 addr, __be16 port)
+static inline unsigned ip_vs_svc_hashkey(unsigned proto, __be32 addr,
+ __be16 port)
{
register unsigned porth = ntohs(port);
@@ -294,7 +294,7 @@ ip_vs_svc_hashkey(unsigned proto, __be32
/*
* Returns hash value of fwmark for virtual service lookup
*/
-static __inline__ unsigned ip_vs_svc_fwm_hashkey(__u32 fwmark)
+static inline unsigned ip_vs_svc_fwm_hashkey(__u32 fwmark)
{
return fwmark & IP_VS_SVC_TAB_MASK;
}
@@ -364,8 +364,9 @@ static int ip_vs_svc_unhash(struct ip_vs
/*
* Get service by {proto,addr,port} in the service table.
*/
-static __inline__ struct ip_vs_service *
-__ip_vs_service_get(__u16 protocol, __be32 vaddr, __be16 vport)
+static inline struct ip_vs_service *__ip_vs_service_get(__u16 protocol,
+ __be32 vaddr,
+ __be16 vport)
{
unsigned hash;
struct ip_vs_service *svc;
@@ -390,7 +391,7 @@ __ip_vs_service_get(__u16 protocol, __be
/*
* Get service by {fwmark} in the service table.
*/
-static __inline__ struct ip_vs_service *__ip_vs_svc_fwm_get(__u32 fwmark)
+static inline struct ip_vs_service *__ip_vs_svc_fwm_get(__u32 fwmark)
{
unsigned hash;
struct ip_vs_service *svc;
@@ -480,7 +481,7 @@ __ip_vs_unbind_svc(struct ip_vs_dest *de
/*
* Returns hash value for real service
*/
-static __inline__ unsigned ip_vs_rs_hashkey(__be32 addr, __be16 port)
+static inline unsigned ip_vs_rs_hashkey(__be32 addr, __be16 port)
{
register unsigned porth = ntohs(port);
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 02/14] replace __inline__ by inline in net/ipv6
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
2008-02-06 9:14 ` [patch 01/14] replace __inline__ by inline in net/ipv4 Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 03/14] replace __inline__ by inline in net/appletalk Daniel Lezcano
` (12 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-ipv6.patch --]
[-- Type: text/plain, Size: 9800 bytes --]
replace __inline__ by inline in net/ipv6
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/ipv6/af_inet6.c | 2 +-
net/ipv6/icmp.c | 6 +++---
net/ipv6/ip6_fib.c | 12 ++++++------
net/ipv6/ip6_flowlabel.c | 2 +-
net/ipv6/ip6_output.c | 2 +-
net/ipv6/netfilter/nf_conntrack_reasm.c | 8 ++++----
net/ipv6/raw.c | 2 +-
net/ipv6/reassembly.c | 11 ++++++-----
net/ipv6/route.c | 10 +++++-----
net/ipv6/tcp_ipv6.c | 2 +-
net/ipv6/udp.c | 8 ++++----
11 files changed, 33 insertions(+), 32 deletions(-)
Index: net-2.6/net/ipv6/af_inet6.c
===================================================================
--- net-2.6.orig/net/ipv6/af_inet6.c
+++ net-2.6/net/ipv6/af_inet6.c
@@ -72,7 +72,7 @@ MODULE_LICENSE("GPL");
static struct list_head inetsw6[SOCK_MAX];
static DEFINE_SPINLOCK(inetsw6_lock);
-static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)
+static inline struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)
{
const int offset = sk->sk_prot->obj_size - sizeof(struct ipv6_pinfo);
Index: net-2.6/net/ipv6/icmp.c
===================================================================
--- net-2.6.orig/net/ipv6/icmp.c
+++ net-2.6/net/ipv6/icmp.c
@@ -90,7 +90,7 @@ static struct inet6_protocol icmpv6_prot
.flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
};
-static __inline__ int icmpv6_xmit_lock(void)
+static inline int icmpv6_xmit_lock(void)
{
local_bh_disable();
@@ -105,7 +105,7 @@ static __inline__ int icmpv6_xmit_lock(v
return 0;
}
-static __inline__ void icmpv6_xmit_unlock(void)
+static inline void icmpv6_xmit_unlock(void)
{
spin_unlock_bh(&icmpv6_socket->sk->sk_lock.slock);
}
@@ -203,7 +203,7 @@ static inline int icmpv6_xrlim_allow(str
* highest-order two bits set to 10
*/
-static __inline__ int opt_unrec(struct sk_buff *skb, __u32 offset)
+static inline int opt_unrec(struct sk_buff *skb, __u32 offset)
{
u8 _optval, *op;
Index: net-2.6/net/ipv6/ip6_fib.c
===================================================================
--- net-2.6.orig/net/ipv6/ip6_fib.c
+++ net-2.6/net/ipv6/ip6_fib.c
@@ -120,7 +120,7 @@ static inline void fib6_walker_unlink(st
w->prev = w->next = w;
write_unlock_bh(&fib6_walker_lock);
}
-static __inline__ u32 fib6_new_sernum(void)
+static inline u32 fib6_new_sernum(void)
{
u32 n = ++rt_sernum;
if ((__s32)n <= 0)
@@ -139,14 +139,14 @@ static __inline__ u32 fib6_new_sernum(vo
* test bit
*/
-static __inline__ __be32 addr_bit_set(void *token, int fn_bit)
+static inline __be32 addr_bit_set(void *token, int fn_bit)
{
__be32 *addr = token;
return htonl(1 << ((~fn_bit)&0x1F)) & addr[fn_bit>>5];
}
-static __inline__ struct fib6_node * node_alloc(void)
+static inline struct fib6_node *node_alloc(void)
{
struct fib6_node *fn;
@@ -155,12 +155,12 @@ static __inline__ struct fib6_node * nod
return fn;
}
-static __inline__ void node_free(struct fib6_node * fn)
+static inline void node_free(struct fib6_node *fn)
{
kmem_cache_free(fib6_node_kmem, fn);
}
-static __inline__ void rt6_release(struct rt6_info *rt)
+static inline void rt6_release(struct rt6_info *rt)
{
if (atomic_dec_and_test(&rt->rt6i_ref))
dst_free(&rt->u.dst);
@@ -677,7 +677,7 @@ static int fib6_add_rt2node(struct fib6_
return 0;
}
-static __inline__ void fib6_start_gc(struct rt6_info *rt)
+static inline void fib6_start_gc(struct rt6_info *rt)
{
if (ip6_fib_timer.expires == 0 &&
(rt->rt6i_flags & (RTF_EXPIRES|RTF_CACHE)))
Index: net-2.6/net/ipv6/ip6_flowlabel.c
===================================================================
--- net-2.6.orig/net/ipv6/ip6_flowlabel.c
+++ net-2.6/net/ipv6/ip6_flowlabel.c
@@ -62,7 +62,7 @@ static DEFINE_RWLOCK(ip6_fl_lock);
static DEFINE_RWLOCK(ip6_sk_fl_lock);
-static __inline__ struct ip6_flowlabel * __fl_lookup(__be32 label)
+static inline struct ip6_flowlabel *__fl_lookup(__be32 label)
{
struct ip6_flowlabel *fl;
Index: net-2.6/net/ipv6/ip6_output.c
===================================================================
--- net-2.6.orig/net/ipv6/ip6_output.c
+++ net-2.6/net/ipv6/ip6_output.c
@@ -58,7 +58,7 @@
static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
-static __inline__ void ipv6_select_ident(struct sk_buff *skb, struct frag_hdr *fhdr)
+static inline void ipv6_select_ident(struct sk_buff *skb, struct frag_hdr *fhdr)
{
static u32 ipv6_fragmentation_id = 1;
static DEFINE_SPINLOCK(ip6_id_lock);
Index: net-2.6/net/ipv6/raw.c
===================================================================
--- net-2.6.orig/net/ipv6/raw.c
+++ net-2.6/net/ipv6/raw.c
@@ -116,7 +116,7 @@ found:
* 0 - deliver
* 1 - block
*/
-static __inline__ int icmpv6_filter(struct sock *sk, struct sk_buff *skb)
+static inline int icmpv6_filter(struct sock *sk, struct sk_buff *skb)
{
struct icmp6hdr *icmph;
struct raw6_sock *rp = raw6_sk(sk);
Index: net-2.6/net/ipv6/reassembly.c
===================================================================
--- net-2.6.orig/net/ipv6/reassembly.c
+++ net-2.6/net/ipv6/reassembly.c
@@ -171,7 +171,7 @@ EXPORT_SYMBOL(ip6_frag_init);
/* Destruction primitives. */
-static __inline__ void fq_put(struct frag_queue *fq)
+static inline void fq_put(struct frag_queue *fq)
{
inet_frag_put(&fq->q, &ip6_frags);
}
@@ -179,7 +179,7 @@ static __inline__ void fq_put(struct fra
/* Kill fq entry. It is not destroyed immediately,
* because caller (and someone more) holds reference count.
*/
-static __inline__ void fq_kill(struct frag_queue *fq)
+static inline void fq_kill(struct frag_queue *fq)
{
inet_frag_kill(&fq->q, &ip6_frags);
}
@@ -234,9 +234,10 @@ out:
fq_put(fq);
}
-static __inline__ struct frag_queue *
-fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst,
- struct inet6_dev *idev)
+static inline struct frag_queue *fq_find(struct net *net, __be32 id,
+ struct in6_addr *src,
+ struct in6_addr *dst,
+ struct inet6_dev *idev)
{
struct inet_frag_queue *q;
struct ip6_create_arg arg;
Index: net-2.6/net/ipv6/route.c
===================================================================
--- net-2.6.orig/net/ipv6/route.c
+++ net-2.6/net/ipv6/route.c
@@ -189,7 +189,7 @@ struct rt6_info ip6_blk_hole_entry = {
#endif
/* allocate dst with ip6_dst_ops */
-static __inline__ struct rt6_info *ip6_dst_alloc(void)
+static inline struct rt6_info *ip6_dst_alloc(void)
{
return (struct rt6_info *)dst_alloc(&ip6_dst_ops);
}
@@ -223,7 +223,7 @@ static void ip6_dst_ifdown(struct dst_en
}
}
-static __inline__ int rt6_check_expired(const struct rt6_info *rt)
+static inline int rt6_check_expired(const struct rt6_info *rt)
{
return (rt->rt6i_flags & RTF_EXPIRES &&
time_after(jiffies, rt->rt6i_expires));
@@ -239,9 +239,9 @@ static inline int rt6_need_strict(struct
* Route lookup. Any table->tb6_lock is implied.
*/
-static __inline__ struct rt6_info *rt6_device_match(struct rt6_info *rt,
- int oif,
- int strict)
+static inline struct rt6_info *rt6_device_match(struct rt6_info *rt,
+ int oif,
+ int strict)
{
struct rt6_info *local = NULL;
struct rt6_info *sprt;
Index: net-2.6/net/ipv6/tcp_ipv6.c
===================================================================
--- net-2.6.orig/net/ipv6/tcp_ipv6.c
+++ net-2.6/net/ipv6/tcp_ipv6.c
@@ -99,7 +99,7 @@ static void tcp_v6_hash(struct sock *sk)
}
}
-static __inline__ __sum16 tcp_v6_check(struct tcphdr *th, int len,
+static inline __sum16 tcp_v6_check(struct tcphdr *th, int len,
struct in6_addr *saddr,
struct in6_addr *daddr,
__wsum base)
Index: net-2.6/net/ipv6/udp.c
===================================================================
--- net-2.6.orig/net/ipv6/udp.c
+++ net-2.6/net/ipv6/udp.c
@@ -257,9 +257,9 @@ out:
sock_put(sk);
}
-static __inline__ void udpv6_err(struct sk_buff *skb,
- struct inet6_skb_parm *opt, int type,
- int code, int offset, __be32 info )
+static inline void udpv6_err(struct sk_buff *skb,
+ struct inet6_skb_parm *opt, int type,
+ int code, int offset, __be32 info)
{
__udp6_lib_err(skb, opt, type, code, offset, info, udp_hash);
}
@@ -519,7 +519,7 @@ discard:
return 0;
}
-static __inline__ int udpv6_rcv(struct sk_buff *skb)
+static inline int udpv6_rcv(struct sk_buff *skb)
{
return __udp6_lib_rcv(skb, udp_hash, IPPROTO_UDP);
}
Index: net-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c
===================================================================
--- net-2.6.orig/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ net-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -156,7 +156,7 @@ static inline void frag_kfree_skb(struct
/* Destruction primitives. */
-static __inline__ void fq_put(struct nf_ct_frag6_queue *fq)
+static inline void fq_put(struct nf_ct_frag6_queue *fq)
{
inet_frag_put(&fq->q, &nf_frags);
}
@@ -164,7 +164,7 @@ static __inline__ void fq_put(struct nf_
/* Kill fq entry. It is not destroyed immediately,
* because caller (and someone more) holds reference count.
*/
-static __inline__ void fq_kill(struct nf_ct_frag6_queue *fq)
+static inline void fq_kill(struct nf_ct_frag6_queue *fq)
{
inet_frag_kill(&fq->q, &nf_frags);
}
@@ -195,8 +195,8 @@ out:
/* Creation primitives. */
-static __inline__ struct nf_ct_frag6_queue *
-fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst)
+static inline struct nf_ct_frag6_queue *fq_find(__be32 id, struct in6_addr *src,
+ struct in6_addr *dst)
{
struct inet_frag_queue *q;
struct ip6_create_arg arg;
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 03/14] replace __inline__ by inline in net/appletalk
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
2008-02-06 9:14 ` [patch 01/14] replace __inline__ by inline in net/ipv4 Daniel Lezcano
2008-02-06 9:14 ` [patch 02/14] replace __inline__ by inline in net/ipv6 Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 04/14] replace __inline__ by inline in net/atm Daniel Lezcano
` (11 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-appletalk.patch --]
[-- Type: text/plain, Size: 1529 bytes --]
replace __inline__ by inline in net/appletalk
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/appletalk/atalk_proc.c | 6 +++---
net/appletalk/ddp.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Index: net-2.6/net/appletalk/atalk_proc.c
===================================================================
--- net-2.6.orig/net/appletalk/atalk_proc.c
+++ net-2.6/net/appletalk/atalk_proc.c
@@ -16,7 +16,7 @@
#include <linux/atalk.h>
-static __inline__ struct atalk_iface *atalk_get_interface_idx(loff_t pos)
+static inline struct atalk_iface *atalk_get_interface_idx(loff_t pos)
{
struct atalk_iface *i;
@@ -77,7 +77,7 @@ out:
return 0;
}
-static __inline__ struct atalk_route *atalk_get_route_idx(loff_t pos)
+static inline struct atalk_route *atalk_get_route_idx(loff_t pos)
{
struct atalk_route *r;
@@ -144,7 +144,7 @@ out:
return 0;
}
-static __inline__ struct sock *atalk_get_socket_idx(loff_t pos)
+static inline struct sock *atalk_get_socket_idx(loff_t pos)
{
struct sock *s;
struct hlist_node *node;
Index: net-2.6/net/appletalk/ddp.c
===================================================================
--- net-2.6.orig/net/appletalk/ddp.c
+++ net-2.6/net/appletalk/ddp.c
@@ -1265,7 +1265,7 @@ static int atalk_getname(struct socket *
}
#if defined(CONFIG_IPDDP) || defined(CONFIG_IPDDP_MODULE)
-static __inline__ int is_ip_over_ddp(struct sk_buff *skb)
+static inline int is_ip_over_ddp(struct sk_buff *skb)
{
return skb->data[12] == 22;
}
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 04/14] replace __inline__ by inline in net/atm
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (2 preceding siblings ...)
2008-02-06 9:14 ` [patch 03/14] replace __inline__ by inline in net/appletalk Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 05/14] replace __inline__ by inline in net/core Daniel Lezcano
` (10 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-atm.patch --]
[-- Type: text/plain, Size: 1071 bytes --]
replace __inline__ by inline in net/atm
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/atm/lec.c | 4 ++--
net/atm/resources.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Index: net-2.6/net/atm/lec.c
===================================================================
--- net-2.6.orig/net/atm/lec.c
+++ net-2.6/net/atm/lec.c
@@ -226,8 +226,8 @@ static int lec_open(struct net_device *d
return 0;
}
-static __inline__ void
-lec_send(struct atm_vcc *vcc, struct sk_buff *skb, struct lec_priv *priv)
+static inline void lec_send(struct atm_vcc *vcc, struct sk_buff *skb,
+ struct lec_priv *priv)
{
ATM_SKB(skb)->vcc = vcc;
ATM_SKB(skb)->atm_options = vcc->atm_options;
Index: net-2.6/net/atm/resources.c
===================================================================
--- net-2.6.orig/net/atm/resources.c
+++ net-2.6/net/atm/resources.c
@@ -401,7 +401,7 @@ done:
return error;
}
-static __inline__ void *dev_get_idx(loff_t left)
+static inline void *dev_get_idx(loff_t left)
{
struct list_head *p;
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 05/14] replace __inline__ by inline in net/core
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (3 preceding siblings ...)
2008-02-06 9:14 ` [patch 04/14] replace __inline__ by inline in net/atm Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 06/14] replace __inline__ by inline in net/decnet Daniel Lezcano
` (9 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-core.patch --]
[-- Type: text/plain, Size: 1597 bytes --]
replace __inline__ by inline in net/core
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/core/neighbour.c | 2 +-
net/core/pktgen.c | 2 +-
net/core/scm.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: net-2.6/net/core/neighbour.c
===================================================================
--- net-2.6.orig/net/core/neighbour.c
+++ net-2.6/net/core/neighbour.c
@@ -732,7 +732,7 @@ next_elt:
write_unlock(&tbl->lock);
}
-static __inline__ int neigh_max_probes(struct neighbour *n)
+static inline int neigh_max_probes(struct neighbour *n)
{
struct neigh_parms *p = n->parms;
return (n->nud_state & NUD_PROBE ?
Index: net-2.6/net/core/pktgen.c
===================================================================
--- net-2.6.orig/net/core/pktgen.c
+++ net-2.6/net/core/pktgen.c
@@ -3259,7 +3259,7 @@ static void pktgen_rem_thread(struct pkt
mutex_unlock(&pktgen_thread_lock);
}
-static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
+static inline void pktgen_xmit(struct pktgen_dev *pkt_dev)
{
struct net_device *odev = NULL;
__u64 idle_start = 0;
Index: net-2.6/net/core/scm.c
===================================================================
--- net-2.6.orig/net/core/scm.c
+++ net-2.6/net/core/scm.c
@@ -42,7 +42,7 @@
* setu(g)id.
*/
-static __inline__ int scm_check_creds(struct ucred *creds)
+static inline int scm_check_creds(struct ucred *creds)
{
if ((creds->pid == task_tgid_vnr(current) || capable(CAP_SYS_ADMIN)) &&
((creds->uid == current->uid || creds->uid == current->euid ||
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 06/14] replace __inline__ by inline in net/decnet
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (4 preceding siblings ...)
2008-02-06 9:14 ` [patch 05/14] replace __inline__ by inline in net/core Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 07/14] replace __inline__ by inline in net/sched Daniel Lezcano
` (8 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-decnet.patch --]
[-- Type: text/plain, Size: 3630 bytes --]
replace __inline__ by inline in net/decnet
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/decnet/dn_dev.c | 2 +-
net/decnet/dn_nsp_in.c | 3 ++-
net/decnet/dn_nsp_out.c | 9 +++++----
net/decnet/dn_route.c | 2 +-
net/decnet/dn_table.c | 18 +++++++++---------
5 files changed, 18 insertions(+), 16 deletions(-)
Index: net-2.6/net/decnet/dn_dev.c
===================================================================
--- net-2.6.orig/net/decnet/dn_dev.c
+++ net-2.6/net/decnet/dn_dev.c
@@ -390,7 +390,7 @@ static struct dn_ifaddr *dn_dev_alloc_if
return ifa;
}
-static __inline__ void dn_dev_free_ifa(struct dn_ifaddr *ifa)
+static inline void dn_dev_free_ifa(struct dn_ifaddr *ifa)
{
kfree(ifa);
}
Index: net-2.6/net/decnet/dn_nsp_in.c
===================================================================
--- net-2.6.orig/net/decnet/dn_nsp_in.c
+++ net-2.6/net/decnet/dn_nsp_in.c
@@ -573,7 +573,8 @@ out:
* bh_lock_sock() (its already held when this is called) which
* also allows data and other data to be queued to a socket.
*/
-static __inline__ int dn_queue_skb(struct sock *sk, struct sk_buff *skb, int sig, struct sk_buff_head *queue)
+static inline int dn_queue_skb(struct sock *sk, struct sk_buff *skb,
+ int sig, struct sk_buff_head *queue)
{
int err;
Index: net-2.6/net/decnet/dn_nsp_out.c
===================================================================
--- net-2.6.orig/net/decnet/dn_nsp_out.c
+++ net-2.6/net/decnet/dn_nsp_out.c
@@ -549,10 +549,11 @@ void dn_send_conn_conf(struct sock *sk,
}
-static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
- unsigned short reason, gfp_t gfp,
- struct dst_entry *dst,
- int ddl, unsigned char *dd, __le16 rem, __le16 loc)
+static inline void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
+ unsigned short reason, gfp_t gfp,
+ struct dst_entry *dst,
+ int ddl, unsigned char *dd, __le16 rem,
+ __le16 loc)
{
struct sk_buff *skb = NULL;
int size = 7 + ddl + ((msgflg == NSP_DISCINIT) ? 1 : 0);
Index: net-2.6/net/decnet/dn_route.c
===================================================================
--- net-2.6.orig/net/decnet/dn_route.c
+++ net-2.6/net/decnet/dn_route.c
@@ -135,7 +135,7 @@ static struct dst_ops dn_dst_ops = {
.entries = ATOMIC_INIT(0),
};
-static __inline__ unsigned dn_hash(__le16 src, __le16 dst)
+static inline unsigned dn_hash(__le16 src, __le16 dst)
{
__u16 tmp = (__u16 __force)(src ^ dst);
tmp ^= (tmp >> 3);
Index: net-2.6/net/decnet/dn_table.c
===================================================================
--- net-2.6.orig/net/decnet/dn_table.c
+++ net-2.6/net/decnet/dn_table.c
@@ -381,11 +381,11 @@ errout:
rtnl_set_sk_err(&init_net, RTNLGRP_DECnet_ROUTE, err);
}
-static __inline__ int dn_hash_dump_bucket(struct sk_buff *skb,
- struct netlink_callback *cb,
- struct dn_fib_table *tb,
- struct dn_zone *dz,
- struct dn_fib_node *f)
+static inline int dn_hash_dump_bucket(struct sk_buff *skb,
+ struct netlink_callback *cb,
+ struct dn_fib_table *tb,
+ struct dn_zone *dz,
+ struct dn_fib_node *f)
{
int i, s_i;
@@ -410,10 +410,10 @@ static __inline__ int dn_hash_dump_bucke
return skb->len;
}
-static __inline__ int dn_hash_dump_zone(struct sk_buff *skb,
- struct netlink_callback *cb,
- struct dn_fib_table *tb,
- struct dn_zone *dz)
+static inline int dn_hash_dump_zone(struct sk_buff *skb,
+ struct netlink_callback *cb,
+ struct dn_fib_table *tb,
+ struct dn_zone *dz)
{
int h, s_h;
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 07/14] replace __inline__ by inline in net/sched
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (5 preceding siblings ...)
2008-02-06 9:14 ` [patch 06/14] replace __inline__ by inline in net/decnet Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 08/14] replace __inline__ by inline in net/x25 Daniel Lezcano
` (7 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-sched.patch --]
[-- Type: text/plain, Size: 7851 bytes --]
replace __inline__ by inline in net/sched
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/sched/cls_fw.c | 2 +-
net/sched/cls_route.c | 10 +++++-----
net/sched/cls_u32.c | 10 +++++-----
net/sched/sch_cbq.c | 35 ++++++++++++++++-------------------
net/sched/sch_sfq.c | 2 +-
net/sched/sch_teql.c | 3 +--
6 files changed, 29 insertions(+), 33 deletions(-)
Index: net-2.6/net/sched/cls_fw.c
===================================================================
--- net-2.6.orig/net/sched/cls_fw.c
+++ net-2.6/net/sched/cls_fw.c
@@ -52,7 +52,7 @@ static const struct tcf_ext_map fw_ext_m
.police = TCA_FW_POLICE
};
-static __inline__ int fw_hash(u32 handle)
+static inline int fw_hash(u32 handle)
{
if (HTSIZE == 4096)
return ((handle >> 24) & 0xFFF) ^
Index: net-2.6/net/sched/cls_route.c
===================================================================
--- net-2.6.orig/net/sched/cls_route.c
+++ net-2.6/net/sched/cls_route.c
@@ -67,7 +67,7 @@ static const struct tcf_ext_map route_ex
.action = TCA_ROUTE4_ACT
};
-static __inline__ int route4_fastmap_hash(u32 id, int iif)
+static inline int route4_fastmap_hash(u32 id, int iif)
{
return id&0xF;
}
@@ -90,22 +90,22 @@ route4_set_fastmap(struct route4_head *h
head->fastmap[h].filter = f;
}
-static __inline__ int route4_hash_to(u32 id)
+static inline int route4_hash_to(u32 id)
{
return id&0xFF;
}
-static __inline__ int route4_hash_from(u32 id)
+static inline int route4_hash_from(u32 id)
{
return (id>>16)&0xF;
}
-static __inline__ int route4_hash_iif(int iif)
+static inline int route4_hash_iif(int iif)
{
return 16 + ((iif>>16)&0xF);
}
-static __inline__ int route4_hash_wild(void)
+static inline int route4_hash_wild(void)
{
return 32;
}
Index: net-2.6/net/sched/cls_u32.c
===================================================================
--- net-2.6.orig/net/sched/cls_u32.c
+++ net-2.6/net/sched/cls_u32.c
@@ -89,7 +89,7 @@ static const struct tcf_ext_map u32_ext_
static struct tc_u_common *u32_list;
-static __inline__ unsigned u32_hash_fold(u32 key, struct tc_u32_sel *sel, u8 fshift)
+static inline unsigned u32_hash_fold(u32 key, struct tc_u32_sel *sel, u8 fshift)
{
unsigned h = ntohl(key & sel->hmask)>>fshift;
@@ -217,8 +217,8 @@ deadloop:
return -1;
}
-static __inline__ struct tc_u_hnode *
-u32_lookup_ht(struct tc_u_common *tp_c, u32 handle)
+static inline struct tc_u_hnode *u32_lookup_ht(struct tc_u_common *tp_c,
+ u32 handle)
{
struct tc_u_hnode *ht;
@@ -229,8 +229,8 @@ u32_lookup_ht(struct tc_u_common *tp_c,
return ht;
}
-static __inline__ struct tc_u_knode *
-u32_lookup_key(struct tc_u_hnode *ht, u32 handle)
+static inline struct tc_u_knode *u32_lookup_key(struct tc_u_hnode *ht,
+ u32 handle)
{
unsigned sel;
struct tc_u_knode *n = NULL;
Index: net-2.6/net/sched/sch_cbq.c
===================================================================
--- net-2.6.orig/net/sched/sch_cbq.c
+++ net-2.6/net/sched/sch_cbq.c
@@ -178,15 +178,15 @@ struct cbq_sched_data
#define L2T(cl,len) qdisc_l2t((cl)->R_tab,len)
-static __inline__ unsigned cbq_hash(u32 h)
+static inline unsigned cbq_hash(u32 h)
{
h ^= h>>8;
h ^= h>>4;
return h&0xF;
}
-static __inline__ struct cbq_class *
-cbq_class_lookup(struct cbq_sched_data *q, u32 classid)
+static inline struct cbq_class *cbq_class_lookup(struct cbq_sched_data *q,
+ u32 classid)
{
struct cbq_class *cl;
@@ -303,7 +303,7 @@ fallback:
of its priority band.
*/
-static __inline__ void cbq_activate_class(struct cbq_class *cl)
+static inline void cbq_activate_class(struct cbq_class *cl)
{
struct cbq_sched_data *q = qdisc_priv(cl->qdisc);
int prio = cl->cpriority;
@@ -706,9 +706,9 @@ static int cbq_reshape_fail(struct sk_bu
Probably, it is wrong. This question needs further investigation.
*/
-static __inline__ void
-cbq_update_toplevel(struct cbq_sched_data *q, struct cbq_class *cl,
- struct cbq_class *borrowed)
+static inline void cbq_update_toplevel(struct cbq_sched_data *q,
+ struct cbq_class *cl,
+ struct cbq_class *borrowed)
{
if (cl && q->toplevel >= borrowed->level) {
if (cl->q->q.qlen > 1) {
@@ -811,8 +811,7 @@ cbq_update(struct cbq_sched_data *q)
cbq_update_toplevel(q, this, q->tx_borrowed);
}
-static __inline__ struct cbq_class *
-cbq_under_limit(struct cbq_class *cl)
+static inline struct cbq_class *cbq_under_limit(struct cbq_class *cl)
{
struct cbq_sched_data *q = qdisc_priv(cl->qdisc);
struct cbq_class *this_cl = cl;
@@ -849,8 +848,7 @@ cbq_under_limit(struct cbq_class *cl)
return cl;
}
-static __inline__ struct sk_buff *
-cbq_dequeue_prio(struct Qdisc *sch, int prio)
+static inline struct sk_buff *cbq_dequeue_prio(struct Qdisc *sch, int prio)
{
struct cbq_sched_data *q = qdisc_priv(sch);
struct cbq_class *cl_tail, *cl_prev, *cl;
@@ -952,8 +950,7 @@ next_class:
return NULL;
}
-static __inline__ struct sk_buff *
-cbq_dequeue_1(struct Qdisc *sch)
+static inline struct sk_buff *cbq_dequeue_1(struct Qdisc *sch)
{
struct cbq_sched_data *q = qdisc_priv(sch);
struct sk_buff *skb;
@@ -1443,7 +1440,7 @@ static int cbq_init(struct Qdisc *sch, s
return 0;
}
-static __inline__ int cbq_dump_rate(struct sk_buff *skb, struct cbq_class *cl)
+static inline int cbq_dump_rate(struct sk_buff *skb, struct cbq_class *cl)
{
unsigned char *b = skb_tail_pointer(skb);
@@ -1455,7 +1452,7 @@ nla_put_failure:
return -1;
}
-static __inline__ int cbq_dump_lss(struct sk_buff *skb, struct cbq_class *cl)
+static inline int cbq_dump_lss(struct sk_buff *skb, struct cbq_class *cl)
{
unsigned char *b = skb_tail_pointer(skb);
struct tc_cbq_lssopt opt;
@@ -1480,7 +1477,7 @@ nla_put_failure:
return -1;
}
-static __inline__ int cbq_dump_wrr(struct sk_buff *skb, struct cbq_class *cl)
+static inline int cbq_dump_wrr(struct sk_buff *skb, struct cbq_class *cl)
{
unsigned char *b = skb_tail_pointer(skb);
struct tc_cbq_wrropt opt;
@@ -1498,7 +1495,7 @@ nla_put_failure:
return -1;
}
-static __inline__ int cbq_dump_ovl(struct sk_buff *skb, struct cbq_class *cl)
+static inline int cbq_dump_ovl(struct sk_buff *skb, struct cbq_class *cl)
{
unsigned char *b = skb_tail_pointer(skb);
struct tc_cbq_ovl opt;
@@ -1515,7 +1512,7 @@ nla_put_failure:
return -1;
}
-static __inline__ int cbq_dump_fopt(struct sk_buff *skb, struct cbq_class *cl)
+static inline int cbq_dump_fopt(struct sk_buff *skb, struct cbq_class *cl)
{
unsigned char *b = skb_tail_pointer(skb);
struct tc_cbq_fopt opt;
@@ -1534,7 +1531,7 @@ nla_put_failure:
}
#ifdef CONFIG_NET_CLS_ACT
-static __inline__ int cbq_dump_police(struct sk_buff *skb, struct cbq_class *cl)
+static inline int cbq_dump_police(struct sk_buff *skb, struct cbq_class *cl)
{
unsigned char *b = skb_tail_pointer(skb);
struct tc_cbq_police opt;
Index: net-2.6/net/sched/sch_sfq.c
===================================================================
--- net-2.6.orig/net/sched/sch_sfq.c
+++ net-2.6/net/sched/sch_sfq.c
@@ -109,7 +109,7 @@ struct sfq_sched_data
struct sfq_head dep[SFQ_DEPTH*2]; /* Linked list of slots, indexed by depth */
};
-static __inline__ unsigned sfq_fold_hash(struct sfq_sched_data *q, u32 h, u32 h1)
+static inline unsigned sfq_fold_hash(struct sfq_sched_data *q, u32 h, u32 h1)
{
return jhash_2words(h, h1, q->perturbation) & (SFQ_HASH_DIVISOR - 1);
}
Index: net-2.6/net/sched/sch_teql.c
===================================================================
--- net-2.6.orig/net/sched/sch_teql.c
+++ net-2.6/net/sched/sch_teql.c
@@ -121,8 +121,7 @@ teql_dequeue(struct Qdisc* sch)
return skb;
}
-static __inline__ void
-teql_neigh_release(struct neighbour *n)
+static inline void teql_neigh_release(struct neighbour *n)
{
if (n)
neigh_release(n);
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 08/14] replace __inline__ by inline in net/x25
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (6 preceding siblings ...)
2008-02-06 9:14 ` [patch 07/14] replace __inline__ by inline in net/sched Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 09/14] replace __inline__ by inline in net/llc Daniel Lezcano
` (6 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-x25.patch --]
[-- Type: text/plain, Size: 1062 bytes --]
replace __inline__ by inline in net/x25
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/x25/x25_proc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: net-2.6/net/x25/x25_proc.c
===================================================================
--- net-2.6.orig/net/x25/x25_proc.c
+++ net-2.6/net/x25/x25_proc.c
@@ -25,7 +25,7 @@
#include <net/x25.h>
#ifdef CONFIG_PROC_FS
-static __inline__ struct x25_route *x25_get_route_idx(loff_t pos)
+static inline struct x25_route *x25_get_route_idx(loff_t pos)
{
struct list_head *route_entry;
struct x25_route *rt = NULL;
@@ -93,7 +93,7 @@ out:
return 0;
}
-static __inline__ struct sock *x25_get_socket_idx(loff_t pos)
+static inline struct sock *x25_get_socket_idx(loff_t pos)
{
struct sock *s;
struct hlist_node *node;
@@ -170,7 +170,7 @@ out:
return 0;
}
-static __inline__ struct x25_forward *x25_get_forward_idx(loff_t pos)
+static inline struct x25_forward *x25_get_forward_idx(loff_t pos)
{
struct x25_forward *f;
struct list_head *entry;
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 09/14] replace __inline__ by inline in net/llc
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (7 preceding siblings ...)
2008-02-06 9:14 ` [patch 08/14] replace __inline__ by inline in net/x25 Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 10/14] replace __inline__ by inline in net/lapb Daniel Lezcano
` (5 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-llc.patch --]
[-- Type: text/plain, Size: 1259 bytes --]
replace __inline__ by inline in net/llc
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/llc/llc_input.c | 2 +-
net/llc/llc_station.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
Index: net-2.6/net/llc/llc_input.c
===================================================================
--- net-2.6.orig/net/llc/llc_input.c
+++ net-2.6/net/llc/llc_input.c
@@ -61,7 +61,7 @@ void llc_set_station_handler(void (*hand
*
* This function returns which LLC component must handle this PDU.
*/
-static __inline__ int llc_pdu_type(struct sk_buff *skb)
+static inline int llc_pdu_type(struct sk_buff *skb)
{
int type = LLC_DEST_CONN; /* I-PDU or S-PDU type */
struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
Index: net-2.6/net/llc/llc_station.c
===================================================================
--- net-2.6.orig/net/llc/llc_station.c
+++ net-2.6/net/llc/llc_station.c
@@ -80,8 +80,7 @@ struct llc_station_state_ev {
struct list_head node; /* node in station->ev_q.list */
};
-static __inline__ struct llc_station_state_ev *
- llc_station_ev(struct sk_buff *skb)
+static inline struct llc_station_state_ev *llc_station_ev(struct sk_buff *skb)
{
return (struct llc_station_state_ev *)skb->cb;
}
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 10/14] replace __inline__ by inline in net/lapb
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (8 preceding siblings ...)
2008-02-06 9:14 ` [patch 09/14] replace __inline__ by inline in net/llc Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 11/14] replace __inline__ by inline in net/key Daniel Lezcano
` (4 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-lapb.patch --]
[-- Type: text/plain, Size: 766 bytes --]
replace __inline__ by inline in net/lapb
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/lapb/lapb_iface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: net-2.6/net/lapb/lapb_iface.c
===================================================================
--- net-2.6.orig/net/lapb/lapb_iface.c
+++ net-2.6/net/lapb/lapb_iface.c
@@ -50,12 +50,12 @@ static void lapb_free_cb(struct lapb_cb
kfree(lapb);
}
-static __inline__ void lapb_hold(struct lapb_cb *lapb)
+static inline void lapb_hold(struct lapb_cb *lapb)
{
atomic_inc(&lapb->refcnt);
}
-static __inline__ void lapb_put(struct lapb_cb *lapb)
+static inline void lapb_put(struct lapb_cb *lapb)
{
if (atomic_dec_and_test(&lapb->refcnt))
lapb_free_cb(lapb);
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 11/14] replace __inline__ by inline in net/key
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (9 preceding siblings ...)
2008-02-06 9:14 ` [patch 10/14] replace __inline__ by inline in net/lapb Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 12/14] replace __inline__ by inline in net/ipx Daniel Lezcano
` (3 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-af_key.patch --]
[-- Type: text/plain, Size: 1007 bytes --]
replace __inline__ by inline in net/key
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/key/af_key.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: net-2.6/net/key/af_key.c
===================================================================
--- net-2.6.orig/net/key/af_key.c
+++ net-2.6/net/key/af_key.c
@@ -92,13 +92,13 @@ static void pfkey_table_grab(void)
}
}
-static __inline__ void pfkey_table_ungrab(void)
+static inline void pfkey_table_ungrab(void)
{
write_unlock_bh(&pfkey_table_lock);
wake_up(&pfkey_table_wait);
}
-static __inline__ void pfkey_lock_table(void)
+static inline void pfkey_lock_table(void)
{
/* read_lock() synchronizes us to pfkey_table_grab */
@@ -107,7 +107,7 @@ static __inline__ void pfkey_lock_table(
read_unlock(&pfkey_table_lock);
}
-static __inline__ void pfkey_unlock_table(void)
+static inline void pfkey_unlock_table(void)
{
if (atomic_dec_and_test(&pfkey_table_users))
wake_up(&pfkey_table_wait);
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 12/14] replace __inline__ by inline in net/ipx
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (10 preceding siblings ...)
2008-02-06 9:14 ` [patch 11/14] replace __inline__ by inline in net/key Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 13/14] replace __inline__ by inline in include/net Daniel Lezcano
` (2 subsequent siblings)
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-ipx.patch --]
[-- Type: text/plain, Size: 1563 bytes --]
replace __inline__ by inline in net/ipx
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
net/ipx/af_ipx.c | 2 +-
net/ipx/ipx_proc.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Index: net-2.6/net/ipx/af_ipx.c
===================================================================
--- net-2.6.orig/net/ipx/af_ipx.c
+++ net-2.6/net/ipx/af_ipx.c
@@ -323,7 +323,7 @@ void ipxitf_down(struct ipx_interface *i
spin_unlock_bh(&ipx_interfaces_lock);
}
-static __inline__ void __ipxitf_put(struct ipx_interface *intrfc)
+static inline void __ipxitf_put(struct ipx_interface *intrfc)
{
if (atomic_dec_and_test(&intrfc->refcnt))
__ipxitf_down(intrfc);
Index: net-2.6/net/ipx/ipx_proc.c
===================================================================
--- net-2.6.orig/net/ipx/ipx_proc.c
+++ net-2.6/net/ipx/ipx_proc.c
@@ -13,7 +13,7 @@
#include <net/tcp_states.h>
#include <net/ipx.h>
-static __inline__ struct ipx_interface *ipx_get_interface_idx(loff_t pos)
+static inline struct ipx_interface *ipx_get_interface_idx(loff_t pos)
{
struct ipx_interface *i;
@@ -107,7 +107,7 @@ static struct ipx_route *ipx_routes_next
return rc;
}
-static __inline__ struct ipx_route *ipx_get_route_idx(loff_t pos)
+static inline struct ipx_route *ipx_get_route_idx(loff_t pos)
{
struct ipx_route *r;
@@ -165,7 +165,7 @@ out:
return 0;
}
-static __inline__ struct sock *ipx_get_socket_idx(loff_t pos)
+static inline struct sock *ipx_get_socket_idx(loff_t pos)
{
struct sock *s = NULL;
struct hlist_node *node;
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 13/14] replace __inline__ by inline in include/net
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (11 preceding siblings ...)
2008-02-06 9:14 ` [patch 12/14] replace __inline__ by inline in net/ipx Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 9:14 ` [patch 14/14] replace __inline__ by inline in include/linux (net related) Daniel Lezcano
2008-02-06 11:29 ` [patch 00/14] replace __inline__ by inline in net code David Miller
14 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-include-net.patch --]
[-- Type: text/plain, Size: 20460 bytes --]
replace __inline__ by inline in include/net
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
include/net/addrconf.h | 2 +-
include/net/ax25.h | 2 +-
include/net/checksum.h | 4 ++--
include/net/dn_nsp.h | 16 ++++++++--------
include/net/ip.h | 2 +-
include/net/ip6_checksum.h | 8 ++++----
include/net/ip_vs.h | 2 +-
include/net/ipx.h | 16 ++++++++--------
include/net/llc_c_ev.h | 4 ++--
include/net/llc_conn.h | 4 ++--
include/net/llc_s_ev.h | 2 +-
include/net/netrom.h | 8 ++++----
include/net/scm.h | 14 ++++++++------
include/net/sock.h | 20 ++++++++++----------
include/net/tcp.h | 6 +++---
include/net/udplite.h | 4 ++--
include/net/x25.h | 8 ++++----
include/net/xfrm.h | 42 ++++++++++++++++++++----------------------
18 files changed, 82 insertions(+), 82 deletions(-)
Index: net-2.6/include/net/addrconf.h
===================================================================
--- net-2.6.orig/include/net/addrconf.h
+++ net-2.6/include/net/addrconf.h
@@ -190,7 +190,7 @@ extern void addrconf_forwarding_on(voi
* Hash function taken from net_alias.c
*/
-static __inline__ u8 ipv6_addr_hash(const struct in6_addr *addr)
+static inline u8 ipv6_addr_hash(const struct in6_addr *addr)
{
__u32 word;
Index: net-2.6/include/net/ax25.h
===================================================================
--- net-2.6.orig/include/net/ax25.h
+++ net-2.6/include/net/ax25.h
@@ -252,7 +252,7 @@ typedef struct ax25_cb {
#define ax25_cb_hold(__ax25) \
atomic_inc(&((__ax25)->refcount))
-static __inline__ void ax25_cb_put(ax25_cb *ax25)
+static inline void ax25_cb_put(ax25_cb *ax25)
{
if (atomic_dec_and_test(&ax25->refcount)) {
kfree(ax25->digipeat);
Index: net-2.6/include/net/checksum.h
===================================================================
--- net-2.6.orig/include/net/checksum.h
+++ net-2.6/include/net/checksum.h
@@ -41,8 +41,8 @@ __wsum csum_and_copy_from_user (const vo
#endif
#ifndef HAVE_CSUM_COPY_USER
-static __inline__ __wsum csum_and_copy_to_user
-(const void *src, void __user *dst, int len, __wsum sum, int *err_ptr)
+static inline __wsum csum_and_copy_to_user(const void *src, void __user *dst,
+ int len, __wsum sum, int *err_ptr)
{
sum = csum_partial(src, len, sum);
Index: net-2.6/include/net/dn_nsp.h
===================================================================
--- net-2.6.orig/include/net/dn_nsp.h
+++ net-2.6/include/net/dn_nsp.h
@@ -150,7 +150,7 @@ struct srcobj_fmt
* numbers used in NSP. Similar in operation to the functions
* of the same name in TCP.
*/
-static __inline__ int dn_before(__u16 seq1, __u16 seq2)
+static inline int dn_before(__u16 seq1, __u16 seq2)
{
seq1 &= 0x0fff;
seq2 &= 0x0fff;
@@ -159,7 +159,7 @@ static __inline__ int dn_before(__u16 se
}
-static __inline__ int dn_after(__u16 seq1, __u16 seq2)
+static inline int dn_after(__u16 seq1, __u16 seq2)
{
seq1 &= 0x0fff;
seq2 &= 0x0fff;
@@ -167,23 +167,23 @@ static __inline__ int dn_after(__u16 seq
return (int)((seq2 - seq1) & 0x0fff) > 2048;
}
-static __inline__ int dn_equal(__u16 seq1, __u16 seq2)
+static inline int dn_equal(__u16 seq1, __u16 seq2)
{
return ((seq1 ^ seq2) & 0x0fff) == 0;
}
-static __inline__ int dn_before_or_equal(__u16 seq1, __u16 seq2)
+static inline int dn_before_or_equal(__u16 seq1, __u16 seq2)
{
return (dn_before(seq1, seq2) || dn_equal(seq1, seq2));
}
-static __inline__ void seq_add(__u16 *seq, __u16 off)
+static inline void seq_add(__u16 *seq, __u16 off)
{
(*seq) += off;
(*seq) &= 0x0fff;
}
-static __inline__ int seq_next(__u16 seq1, __u16 seq2)
+static inline int seq_next(__u16 seq1, __u16 seq2)
{
return dn_equal(seq1 + 1, seq2);
}
@@ -191,7 +191,7 @@ static __inline__ int seq_next(__u16 seq
/*
* Can we delay the ack ?
*/
-static __inline__ int sendack(__u16 seq)
+static inline int sendack(__u16 seq)
{
return (int)((seq & 0x1000) ? 0 : 1);
}
@@ -199,7 +199,7 @@ static __inline__ int sendack(__u16 seq)
/*
* Is socket congested ?
*/
-static __inline__ int dn_congested(struct sock *sk)
+static inline int dn_congested(struct sock *sk)
{
return atomic_read(&sk->sk_rmem_alloc) > (sk->sk_rcvbuf >> 1);
}
Index: net-2.6/include/net/ip.h
===================================================================
--- net-2.6.orig/include/net/ip.h
+++ net-2.6/include/net/ip.h
@@ -298,7 +298,7 @@ static inline void ip_ib_mc_map(__be32 n
#include <linux/ipv6.h>
#endif
-static __inline__ void inet_reset_saddr(struct sock *sk)
+static inline void inet_reset_saddr(struct sock *sk)
{
inet_sk(sk)->rcv_saddr = inet_sk(sk)->saddr = 0;
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
Index: net-2.6/include/net/ip6_checksum.h
===================================================================
--- net-2.6.orig/include/net/ip6_checksum.h
+++ net-2.6/include/net/ip6_checksum.h
@@ -34,10 +34,10 @@
#ifndef _HAVE_ARCH_IPV6_CSUM
-static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
- const struct in6_addr *daddr,
- __u32 len, unsigned short proto,
- __wsum csum)
+static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
+ const struct in6_addr *daddr,
+ __u32 len, unsigned short proto,
+ __wsum csum)
{
int carry;
Index: net-2.6/include/net/ip_vs.h
===================================================================
--- net-2.6.orig/include/net/ip_vs.h
+++ net-2.6/include/net/ip_vs.h
@@ -925,7 +925,7 @@ extern void ip_vs_dst_reset(struct ip_vs
extern int ip_vs_drop_rate;
extern int ip_vs_drop_counter;
-static __inline__ int ip_vs_todrop(void)
+static inline int ip_vs_todrop(void)
{
if (!ip_vs_drop_rate) return 0;
if (--ip_vs_drop_counter > 0) return 0;
Index: net-2.6/include/net/ipx.h
===================================================================
--- net-2.6.orig/include/net/ipx.h
+++ net-2.6/include/net/ipx.h
@@ -41,7 +41,7 @@ struct ipxhdr {
struct ipx_address ipx_source __attribute__ ((packed));
};
-static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb)
+static inline struct ipxhdr *ipx_hdr(struct sk_buff *skb)
{
return (struct ipxhdr *)skb_transport_header(skb);
}
@@ -135,27 +135,27 @@ extern void ipx_proc_exit(void);
extern const char *ipx_frame_name(__be16);
extern const char *ipx_device_name(struct ipx_interface *intrfc);
-static __inline__ void ipxitf_hold(struct ipx_interface *intrfc)
+static inline void ipxitf_hold(struct ipx_interface *intrfc)
{
atomic_inc(&intrfc->refcnt);
}
extern void ipxitf_down(struct ipx_interface *intrfc);
-static __inline__ void ipxitf_put(struct ipx_interface *intrfc)
+static inline void ipxitf_put(struct ipx_interface *intrfc)
{
if (atomic_dec_and_test(&intrfc->refcnt))
ipxitf_down(intrfc);
}
-static __inline__ void ipxrtr_hold(struct ipx_route *rt)
+static inline void ipxrtr_hold(struct ipx_route *rt)
{
- atomic_inc(&rt->refcnt);
+ atomic_inc(&rt->refcnt);
}
-static __inline__ void ipxrtr_put(struct ipx_route *rt)
+static inline void ipxrtr_put(struct ipx_route *rt)
{
- if (atomic_dec_and_test(&rt->refcnt))
- kfree(rt);
+ if (atomic_dec_and_test(&rt->refcnt))
+ kfree(rt);
}
#endif /* _NET_INET_IPX_H_ */
Index: net-2.6/include/net/llc_c_ev.h
===================================================================
--- net-2.6.orig/include/net/llc_c_ev.h
+++ net-2.6/include/net/llc_c_ev.h
@@ -120,7 +120,7 @@ struct llc_conn_state_ev {
u8 cfm_prim;
};
-static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
+static inline struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
{
return (struct llc_conn_state_ev *)skb->cb;
}
@@ -261,7 +261,7 @@ extern int llc_conn_ev_qlfy_set_status_c
extern int llc_conn_ev_qlfy_set_status_rst_done(struct sock *sk,
struct sk_buff *skb);
-static __inline__ int llc_conn_space(struct sock *sk, struct sk_buff *skb)
+static inline int llc_conn_space(struct sock *sk, struct sk_buff *skb)
{
return atomic_read(&sk->sk_rmem_alloc) + skb->truesize <
(unsigned)sk->sk_rcvbuf;
Index: net-2.6/include/net/llc_conn.h
===================================================================
--- net-2.6.orig/include/net/llc_conn.h
+++ net-2.6/include/net/llc_conn.h
@@ -83,12 +83,12 @@ static inline struct llc_sock *llc_sk(co
return (struct llc_sock *)sk;
}
-static __inline__ void llc_set_backlog_type(struct sk_buff *skb, char type)
+static inline void llc_set_backlog_type(struct sk_buff *skb, char type)
{
skb->cb[sizeof(skb->cb) - 1] = type;
}
-static __inline__ char llc_backlog_type(struct sk_buff *skb)
+static inline char llc_backlog_type(struct sk_buff *skb)
{
return skb->cb[sizeof(skb->cb) - 1];
}
Index: net-2.6/include/net/llc_s_ev.h
===================================================================
--- net-2.6.orig/include/net/llc_s_ev.h
+++ net-2.6/include/net/llc_s_ev.h
@@ -44,7 +44,7 @@ struct llc_sap_state_ev {
struct llc_addr daddr;
};
-static __inline__ struct llc_sap_state_ev *llc_sap_ev(struct sk_buff *skb)
+static inline struct llc_sap_state_ev *llc_sap_ev(struct sk_buff *skb)
{
return (struct llc_sap_state_ev *)skb->cb;
}
Index: net-2.6/include/net/netrom.h
===================================================================
--- net-2.6.orig/include/net/netrom.h
+++ net-2.6/include/net/netrom.h
@@ -123,7 +123,7 @@ struct nr_node {
#define nr_node_hold(__nr_node) \
atomic_inc(&((__nr_node)->refcount))
-static __inline__ void nr_node_put(struct nr_node *nr_node)
+static inline void nr_node_put(struct nr_node *nr_node)
{
if (atomic_dec_and_test(&nr_node->refcount)) {
kfree(nr_node);
@@ -133,7 +133,7 @@ static __inline__ void nr_node_put(struc
#define nr_neigh_hold(__nr_neigh) \
atomic_inc(&((__nr_neigh)->refcount))
-static __inline__ void nr_neigh_put(struct nr_neigh *nr_neigh)
+static inline void nr_neigh_put(struct nr_neigh *nr_neigh)
{
if (atomic_dec_and_test(&nr_neigh->refcount)) {
kfree(nr_neigh->digipeat);
@@ -143,13 +143,13 @@ static __inline__ void nr_neigh_put(stru
/* nr_node_lock and nr_node_unlock also hold/put the node's refcounter.
*/
-static __inline__ void nr_node_lock(struct nr_node *nr_node)
+static inline void nr_node_lock(struct nr_node *nr_node)
{
nr_node_hold(nr_node);
spin_lock_bh(&nr_node->node_lock);
}
-static __inline__ void nr_node_unlock(struct nr_node *nr_node)
+static inline void nr_node_unlock(struct nr_node *nr_node)
{
spin_unlock_bh(&nr_node->node_lock);
nr_node_put(nr_node);
Index: net-2.6/include/net/scm.h
===================================================================
--- net-2.6.orig/include/net/scm.h
+++ net-2.6/include/net/scm.h
@@ -35,22 +35,24 @@ extern void __scm_destroy(struct scm_coo
extern struct scm_fp_list * scm_fp_dup(struct scm_fp_list *fpl);
#ifdef CONFIG_SECURITY_NETWORK
-static __inline__ void unix_get_peersec_dgram(struct socket *sock, struct scm_cookie *scm)
+static inline void unix_get_peersec_dgram(struct socket *sock,
+ struct scm_cookie *scm)
{
security_socket_getpeersec_dgram(sock, NULL, &scm->secid);
}
#else
-static __inline__ void unix_get_peersec_dgram(struct socket *sock, struct scm_cookie *scm)
+static inline void unix_get_peersec_dgram(struct socket *sock,
+ struct scm_cookie *scm)
{ }
#endif /* CONFIG_SECURITY_NETWORK */
-static __inline__ void scm_destroy(struct scm_cookie *scm)
+static inline void scm_destroy(struct scm_cookie *scm)
{
if (scm && scm->fp)
__scm_destroy(scm);
}
-static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
+static inline int scm_send(struct socket *sock, struct msghdr *msg,
struct scm_cookie *scm)
{
struct task_struct *p = current;
@@ -86,8 +88,8 @@ static inline void scm_passec(struct soc
{ }
#endif /* CONFIG_SECURITY_NETWORK */
-static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
- struct scm_cookie *scm, int flags)
+static inline void scm_recv(struct socket *sock, struct msghdr *msg,
+ struct scm_cookie *scm, int flags)
{
if (!msg->msg_control)
{
Index: net-2.6/include/net/sock.h
===================================================================
--- net-2.6.orig/include/net/sock.h
+++ net-2.6/include/net/sock.h
@@ -302,17 +302,17 @@ static inline int sk_hashed(const struct
return !sk_unhashed(sk);
}
-static __inline__ void sk_node_init(struct hlist_node *node)
+static inline void sk_node_init(struct hlist_node *node)
{
node->pprev = NULL;
}
-static __inline__ void __sk_del_node(struct sock *sk)
+static inline void __sk_del_node(struct sock *sk)
{
__hlist_del(&sk->sk_node);
}
-static __inline__ int __sk_del_node_init(struct sock *sk)
+static inline int __sk_del_node_init(struct sock *sk)
{
if (sk_hashed(sk)) {
__sk_del_node(sk);
@@ -341,7 +341,7 @@ static inline void __sock_put(struct soc
atomic_dec(&sk->sk_refcnt);
}
-static __inline__ int sk_del_node_init(struct sock *sk)
+static inline int sk_del_node_init(struct sock *sk)
{
int rc = __sk_del_node_init(sk);
@@ -353,23 +353,23 @@ static __inline__ int sk_del_node_init(s
return rc;
}
-static __inline__ void __sk_add_node(struct sock *sk, struct hlist_head *list)
+static inline void __sk_add_node(struct sock *sk, struct hlist_head *list)
{
hlist_add_head(&sk->sk_node, list);
}
-static __inline__ void sk_add_node(struct sock *sk, struct hlist_head *list)
+static inline void sk_add_node(struct sock *sk, struct hlist_head *list)
{
sock_hold(sk);
__sk_add_node(sk, list);
}
-static __inline__ void __sk_del_bind_node(struct sock *sk)
+static inline void __sk_del_bind_node(struct sock *sk)
{
__hlist_del(&sk->sk_bind_node);
}
-static __inline__ void sk_add_bind_node(struct sock *sk,
+static inline void sk_add_bind_node(struct sock *sk,
struct hlist_head *list)
{
hlist_add_head(&sk->sk_bind_node, list);
@@ -1295,8 +1295,8 @@ static inline int sock_intr_errno(long t
extern void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
struct sk_buff *skb);
-static __inline__ void
-sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
+static inline void sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
+ struct sk_buff *skb)
{
ktime_t kt = skb->tstamp;
Index: net-2.6/include/net/tcp.h
===================================================================
--- net-2.6.orig/include/net/tcp.h
+++ net-2.6/include/net/tcp.h
@@ -338,8 +338,8 @@ static inline void tcp_clear_options(str
#define TCP_ECN_QUEUE_CWR 2
#define TCP_ECN_DEMAND_CWR 4
-static __inline__ void
-TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th)
+static inline void TCP_ECN_create_request(struct request_sock *req,
+ struct tcphdr *th)
{
if (sysctl_tcp_ecn && th->ece && th->cwr)
inet_rsk(req)->ecn_ok = 1;
@@ -776,7 +776,7 @@ extern __u32 tcp_init_cwnd(struct tcp_so
/* Slow start with delack produces 3 packets of burst, so that
* it is safe "de facto".
*/
-static __inline__ __u32 tcp_max_burst(const struct tcp_sock *tp)
+static inline __u32 tcp_max_burst(const struct tcp_sock *tp)
{
return 3;
}
Index: net-2.6/include/net/udplite.h
===================================================================
--- net-2.6.orig/include/net/udplite.h
+++ net-2.6/include/net/udplite.h
@@ -16,8 +16,8 @@ extern struct hlist_head udplite_hash[U
/*
* Checksum computation is all in software, hence simpler getfrag.
*/
-static __inline__ int udplite_getfrag(void *from, char *to, int offset,
- int len, int odd, struct sk_buff *skb)
+static inline int udplite_getfrag(void *from, char *to, int offset,
+ int len, int odd, struct sk_buff *skb)
{
return memcpy_fromiovecend(to, (struct iovec *) from, offset, len);
}
Index: net-2.6/include/net/x25.h
===================================================================
--- net-2.6.orig/include/net/x25.h
+++ net-2.6/include/net/x25.h
@@ -231,12 +231,12 @@ extern struct x25_neigh *x25_get_neigh(s
extern void x25_link_free(void);
/* x25_neigh.c */
-static __inline__ void x25_neigh_hold(struct x25_neigh *nb)
+static inline void x25_neigh_hold(struct x25_neigh *nb)
{
atomic_inc(&nb->refcnt);
}
-static __inline__ void x25_neigh_put(struct x25_neigh *nb)
+static inline void x25_neigh_put(struct x25_neigh *nb)
{
if (atomic_dec_and_test(&nb->refcnt))
kfree(nb);
@@ -254,12 +254,12 @@ extern void x25_route_device_down(struct
extern int x25_route_ioctl(unsigned int, void __user *);
extern void x25_route_free(void);
-static __inline__ void x25_route_hold(struct x25_route *rt)
+static inline void x25_route_hold(struct x25_route *rt)
{
atomic_inc(&rt->refcnt);
}
-static __inline__ void x25_route_put(struct x25_route *rt)
+static inline void x25_route_put(struct x25_route *rt)
{
if (atomic_dec_and_test(&rt->refcnt))
kfree(rt);
Index: net-2.6/include/net/xfrm.h
===================================================================
--- net-2.6.orig/include/net/xfrm.h
+++ net-2.6/include/net/xfrm.h
@@ -667,7 +667,7 @@ static inline void xfrm_state_hold(struc
atomic_inc(&x->refcnt);
}
-static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
+static inline int addr_match(void *token1, void *token2, int prefixlen)
{
__be32 *a1 = token1;
__be32 *a2 = token2;
@@ -693,8 +693,7 @@ static __inline__ int addr_match(void *t
return 1;
}
-static __inline__
-__be16 xfrm_flowi_sport(struct flowi *fl)
+static inline __be16 xfrm_flowi_sport(struct flowi *fl)
{
__be16 port;
switch(fl->proto) {
@@ -717,8 +716,7 @@ __be16 xfrm_flowi_sport(struct flowi *fl
return port;
}
-static __inline__
-__be16 xfrm_flowi_dport(struct flowi *fl)
+static inline __be16 xfrm_flowi_dport(struct flowi *fl)
{
__be16 port;
switch(fl->proto) {
@@ -1016,8 +1014,8 @@ static inline int xfrm6_policy_check_rev
}
#endif
-static __inline__
-xfrm_address_t *xfrm_flowi_daddr(struct flowi *fl, unsigned short family)
+static inline xfrm_address_t *xfrm_flowi_daddr(struct flowi *fl,
+ unsigned short family)
{
switch (family){
case AF_INET:
@@ -1028,8 +1026,8 @@ xfrm_address_t *xfrm_flowi_daddr(struct
return NULL;
}
-static __inline__
-xfrm_address_t *xfrm_flowi_saddr(struct flowi *fl, unsigned short family)
+static inline xfrm_address_t *xfrm_flowi_saddr(struct flowi *fl,
+ unsigned short family)
{
switch (family){
case AF_INET:
@@ -1040,9 +1038,9 @@ xfrm_address_t *xfrm_flowi_saddr(struct
return NULL;
}
-static __inline__ int
-__xfrm4_state_addr_check(struct xfrm_state *x,
- xfrm_address_t *daddr, xfrm_address_t *saddr)
+static inline int __xfrm4_state_addr_check(struct xfrm_state *x,
+ xfrm_address_t *daddr,
+ xfrm_address_t *saddr)
{
if (daddr->a4 == x->id.daddr.a4 &&
(saddr->a4 == x->props.saddr.a4 || !saddr->a4 || !x->props.saddr.a4))
@@ -1050,9 +1048,9 @@ __xfrm4_state_addr_check(struct xfrm_sta
return 0;
}
-static __inline__ int
-__xfrm6_state_addr_check(struct xfrm_state *x,
- xfrm_address_t *daddr, xfrm_address_t *saddr)
+static inline int __xfrm6_state_addr_check(struct xfrm_state *x,
+ xfrm_address_t *daddr,
+ xfrm_address_t *saddr)
{
if (!ipv6_addr_cmp((struct in6_addr *)daddr, (struct in6_addr *)&x->id.daddr) &&
(!ipv6_addr_cmp((struct in6_addr *)saddr, (struct in6_addr *)&x->props.saddr)||
@@ -1062,10 +1060,10 @@ __xfrm6_state_addr_check(struct xfrm_sta
return 0;
}
-static __inline__ int
-xfrm_state_addr_check(struct xfrm_state *x,
- xfrm_address_t *daddr, xfrm_address_t *saddr,
- unsigned short family)
+static inline int xfrm_state_addr_check(struct xfrm_state *x,
+ xfrm_address_t *daddr,
+ xfrm_address_t *saddr,
+ unsigned short family)
{
switch (family) {
case AF_INET:
@@ -1076,9 +1074,9 @@ xfrm_state_addr_check(struct xfrm_state
return 0;
}
-static __inline__ int
-xfrm_state_addr_flow_check(struct xfrm_state *x, struct flowi *fl,
- unsigned short family)
+static inline int xfrm_state_addr_flow_check(struct xfrm_state *x,
+ struct flowi *fl,
+ unsigned short family)
{
switch (family) {
case AF_INET:
--
^ permalink raw reply [flat|nested] 21+ messages in thread* [patch 14/14] replace __inline__ by inline in include/linux (net related)
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (12 preceding siblings ...)
2008-02-06 9:14 ` [patch 13/14] replace __inline__ by inline in include/net Daniel Lezcano
@ 2008-02-06 9:14 ` Daniel Lezcano
2008-02-06 10:31 ` YOSHIFUJI Hideaki / 吉藤英明
2008-02-06 11:29 ` [patch 00/14] replace __inline__ by inline in net code David Miller
14 siblings, 1 reply; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 9:14 UTC (permalink / raw)
To: davem; +Cc: netdev
[-- Attachment #1: remove-__inline__-in-include-linux.patch --]
[-- Type: text/plain, Size: 5853 bytes --]
replace __inline__ by inline in include/linux (net related)
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
include/linux/atm.h | 4 ++--
include/linux/atmsap.h | 2 +-
include/linux/hdlc.h | 13 +++++++------
include/linux/inetdevice.h | 14 ++++++--------
include/linux/netlink.h | 5 +++--
include/linux/rtnetlink.h | 2 +-
6 files changed, 20 insertions(+), 20 deletions(-)
Index: net-2.6/include/linux/atm.h
===================================================================
--- net-2.6.orig/include/linux/atm.h
+++ net-2.6/include/linux/atm.h
@@ -217,13 +217,13 @@ struct sockaddr_atmsvc {
};
-static __inline__ int atmsvc_addr_in_use(struct sockaddr_atmsvc addr)
+static inline int atmsvc_addr_in_use(struct sockaddr_atmsvc addr)
{
return *addr.sas_addr.prv || *addr.sas_addr.pub;
}
-static __inline__ int atmpvc_addr_in_use(struct sockaddr_atmpvc addr)
+static inline int atmpvc_addr_in_use(struct sockaddr_atmpvc addr)
{
return addr.sap_addr.itf || addr.sap_addr.vpi || addr.sap_addr.vci;
}
Index: net-2.6/include/linux/atmsap.h
===================================================================
--- net-2.6.orig/include/linux/atmsap.h
+++ net-2.6/include/linux/atmsap.h
@@ -154,7 +154,7 @@ struct atm_sap {
};
-static __inline__ int blli_in_use(struct atm_blli blli)
+static inline int blli_in_use(struct atm_blli blli)
{
return blli.l2_proto || blli.l3_proto;
}
Index: net-2.6/include/linux/hdlc.h
===================================================================
--- net-2.6.orig/include/linux/hdlc.h
+++ net-2.6/include/linux/hdlc.h
@@ -84,18 +84,19 @@ void unregister_hdlc_protocol(struct hdl
struct net_device *alloc_hdlcdev(void *priv);
-static __inline__ struct hdlc_device_desc* dev_to_desc(struct net_device *dev)
+static inline struct hdlc_device_desc
+*dev_to_desc(struct net_device *dev)
{
return netdev_priv(dev);
}
-static __inline__ hdlc_device* dev_to_hdlc(struct net_device *dev)
+static inline hdlc_device *dev_to_hdlc(struct net_device *dev)
{
return netdev_priv(dev) + sizeof(struct hdlc_device_desc);
}
-static __inline__ void debug_frame(const struct sk_buff *skb)
+static inline void debug_frame(const struct sk_buff *skb)
{
int i;
@@ -120,14 +121,14 @@ int attach_hdlc_protocol(struct net_devi
/* May be used by hardware driver to gain control over HDLC device */
void detach_hdlc_protocol(struct net_device *dev);
-static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev)
+static inline struct net_device_stats *hdlc_stats(struct net_device *dev)
{
return &dev_to_desc(dev)->stats;
}
-static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static inline __be16 hdlc_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
Index: net-2.6/include/linux/inetdevice.h
===================================================================
--- net-2.6.orig/include/linux/inetdevice.h
+++ net-2.6/include/linux/inetdevice.h
@@ -136,7 +136,7 @@ extern __be32 inet_select_addr(const st
extern __be32 inet_confirm_addr(struct in_device *in_dev, __be32 dst, __be32 local, int scope);
extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, __be32 mask);
-static __inline__ int inet_ifa_match(__be32 addr, struct in_ifaddr *ifa)
+static inline int inet_ifa_match(__be32 addr, struct in_ifaddr *ifa)
{
return !((addr^ifa->ifa_address)&ifa->ifa_mask);
}
@@ -145,7 +145,7 @@ static __inline__ int inet_ifa_match(__b
* Check if a mask is acceptable.
*/
-static __inline__ int bad_mask(__be32 mask, __be32 addr)
+static inline int bad_mask(__be32 mask, __be32 addr)
{
__u32 hmask;
if (addr & (mask = ~mask))
@@ -173,8 +173,7 @@ static inline struct in_device *__in_dev
return in_dev;
}
-static __inline__ struct in_device *
-in_dev_get(const struct net_device *dev)
+static inline struct in_device *in_dev_get(const struct net_device *dev)
{
struct in_device *in_dev;
@@ -186,8 +185,7 @@ in_dev_get(const struct net_device *dev)
return in_dev;
}
-static __inline__ struct in_device *
-__in_dev_get_rtnl(const struct net_device *dev)
+static inline struct in_device *__in_dev_get_rtnl(const struct net_device *dev)
{
return (struct in_device*)dev->ip_ptr;
}
@@ -205,14 +203,14 @@ static inline void in_dev_put(struct in_
#endif /* __KERNEL__ */
-static __inline__ __be32 inet_make_mask(int logmask)
+static inline __be32 inet_make_mask(int logmask)
{
if (logmask)
return htonl(~((1<<(32-logmask))-1));
return 0;
}
-static __inline__ int inet_mask_len(__be32 mask)
+static inline int inet_mask_len(__be32 mask)
{
__u32 hmask = ntohl(mask);
if (!hmask)
Index: net-2.6/include/linux/netlink.h
===================================================================
--- net-2.6.orig/include/linux/netlink.h
+++ net-2.6/include/linux/netlink.h
@@ -229,8 +229,9 @@ struct netlink_notify
int protocol;
};
-static __inline__ struct nlmsghdr *
-__nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)
+static inline struct nlmsghdr *__nlmsg_put(struct sk_buff *skb, u32 pid,
+ u32 seq, int type, int len,
+ int flags)
{
struct nlmsghdr *nlh;
int size = NLMSG_LENGTH(len);
Index: net-2.6/include/linux/rtnetlink.h
===================================================================
--- net-2.6.orig/include/linux/rtnetlink.h
+++ net-2.6/include/linux/rtnetlink.h
@@ -602,7 +602,7 @@ struct tcamsg
#include <linux/mutex.h>
-static __inline__ int rtattr_strcmp(const struct rtattr *rta, const char *str)
+static inline int rtattr_strcmp(const struct rtattr *rta, const char *str)
{
int len = strlen(str) + 1;
return len > rta->rta_len || memcmp(RTA_DATA(rta), str, len);
--
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [patch 14/14] replace __inline__ by inline in include/linux (net related)
2008-02-06 9:14 ` [patch 14/14] replace __inline__ by inline in include/linux (net related) Daniel Lezcano
@ 2008-02-06 10:31 ` YOSHIFUJI Hideaki / 吉藤英明
2008-02-06 10:39 ` Daniel Lezcano
2008-02-06 11:25 ` David Miller
0 siblings, 2 replies; 21+ messages in thread
From: YOSHIFUJI Hideaki / 吉藤英明 @ 2008-02-06 10:31 UTC (permalink / raw)
To: dlezcano; +Cc: davem, netdev, yoshfuji
In article <20080206092300.701741592@mai.toulouse-stg.fr.ibm.com> (at Wed, 06 Feb 2008 10:14:19 +0100), Daniel Lezcano <dlezcano@fr.ibm.com> says:
> replace __inline__ by inline in include/linux (net related)
>
> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
> ---
> include/linux/atm.h | 4 ++--
> include/linux/atmsap.h | 2 +-
> include/linux/hdlc.h | 13 +++++++------
> include/linux/inetdevice.h | 14 ++++++--------
> include/linux/netlink.h | 5 +++--
> include/linux/rtnetlink.h | 2 +-
> 6 files changed, 20 insertions(+), 20 deletions(-)
Please do this change within the #ifdef __KERNEL__ .. #endif only.
--yoshfuji
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 14/14] replace __inline__ by inline in include/linux (net related)
2008-02-06 10:31 ` YOSHIFUJI Hideaki / 吉藤英明
@ 2008-02-06 10:39 ` Daniel Lezcano
2008-02-06 11:27 ` David Miller
2008-02-06 11:25 ` David Miller
1 sibling, 1 reply; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 10:39 UTC (permalink / raw)
To: YOSHIFUJI Hideaki / 吉藤英明; +Cc: davem, netdev
YOSHIFUJI Hideaki / 吉藤英明 wrote:
> In article <20080206092300.701741592@mai.toulouse-stg.fr.ibm.com> (at Wed, 06 Feb 2008 10:14:19 +0100), Daniel Lezcano <dlezcano@fr.ibm.com> says:
>
>> replace __inline__ by inline in include/linux (net related)
>>
>> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
>> ---
>> include/linux/atm.h | 4 ++--
>> include/linux/atmsap.h | 2 +-
>> include/linux/hdlc.h | 13 +++++++------
>> include/linux/inetdevice.h | 14 ++++++--------
>> include/linux/netlink.h | 5 +++--
>> include/linux/rtnetlink.h | 2 +-
>> 6 files changed, 20 insertions(+), 20 deletions(-)
>
> Please do this change within the #ifdef __KERNEL__ .. #endif only.
Oups ! I didn't thought about userspace program when modifying these
headers. Thanks for catching this.
Hopefully, the patches can be applied separately. Is it possible to
discard this one ?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 14/14] replace __inline__ by inline in include/linux (net related)
2008-02-06 10:39 ` Daniel Lezcano
@ 2008-02-06 11:27 ` David Miller
2008-02-06 12:13 ` Daniel Lezcano
0 siblings, 1 reply; 21+ messages in thread
From: David Miller @ 2008-02-06 11:27 UTC (permalink / raw)
To: dlezcano; +Cc: yoshfuji, netdev
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Wed, 06 Feb 2008 11:39:27 +0100
> YOSHIFUJI Hideaki / 吉藤英明 wrote:
> > In article <20080206092300.701741592@mai.toulouse-stg.fr.ibm.com> (at Wed, 06 Feb 2008 10:14:19 +0100), Daniel Lezcano <dlezcano@fr.ibm.com> says:
> >
> >> replace __inline__ by inline in include/linux (net related)
> >>
> >> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
> >> ---
> >> include/linux/atm.h | 4 ++--
> >> include/linux/atmsap.h | 2 +-
> >> include/linux/hdlc.h | 13 +++++++------
> >> include/linux/inetdevice.h | 14 ++++++--------
> >> include/linux/netlink.h | 5 +++--
> >> include/linux/rtnetlink.h | 2 +-
> >> 6 files changed, 20 insertions(+), 20 deletions(-)
> >
> > Please do this change within the #ifdef __KERNEL__ .. #endif only.
>
> Oups ! I didn't thought about userspace program when modifying these
> headers. Thanks for catching this.
>
> Hopefully, the patches can be applied separately. Is it possible to
> discard this one ?
What is the real problem though?
Oh, c89 style C compilation will break with plain "inline"?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 14/14] replace __inline__ by inline in include/linux (net related)
2008-02-06 11:27 ` David Miller
@ 2008-02-06 12:13 ` Daniel Lezcano
0 siblings, 0 replies; 21+ messages in thread
From: Daniel Lezcano @ 2008-02-06 12:13 UTC (permalink / raw)
To: David Miller; +Cc: yoshfuji, netdev
David Miller wrote:
> From: Daniel Lezcano <dlezcano@fr.ibm.com>
> Date: Wed, 06 Feb 2008 11:39:27 +0100
>
>> YOSHIFUJI Hideaki / 吉藤英明 wrote:
>>> In article <20080206092300.701741592@mai.toulouse-stg.fr.ibm.com> (at Wed, 06 Feb 2008 10:14:19 +0100), Daniel Lezcano <dlezcano@fr.ibm.com> says:
>>>
>>>> replace __inline__ by inline in include/linux (net related)
>>>>
>>>> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
>>>> ---
>>>> include/linux/atm.h | 4 ++--
>>>> include/linux/atmsap.h | 2 +-
>>>> include/linux/hdlc.h | 13 +++++++------
>>>> include/linux/inetdevice.h | 14 ++++++--------
>>>> include/linux/netlink.h | 5 +++--
>>>> include/linux/rtnetlink.h | 2 +-
>>>> 6 files changed, 20 insertions(+), 20 deletions(-)
>>> Please do this change within the #ifdef __KERNEL__ .. #endif only.
>> Oups ! I didn't thought about userspace program when modifying these
>> headers. Thanks for catching this.
>>
>> Hopefully, the patches can be applied separately. Is it possible to
>> discard this one ?
>
> What is the real problem though?
>
> Oh, c89 style C compilation will break with plain "inline"?
If a userspace program include one of these headers and compile with the
-ansi option, the keyword "inline" will be disabled and the compilation
will fail. For this reason when a header is exported, the __inline__
keyword should be used instead of "inline" to avoid such problem.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 14/14] replace __inline__ by inline in include/linux (net related)
2008-02-06 10:31 ` YOSHIFUJI Hideaki / 吉藤英明
2008-02-06 10:39 ` Daniel Lezcano
@ 2008-02-06 11:25 ` David Miller
1 sibling, 0 replies; 21+ messages in thread
From: David Miller @ 2008-02-06 11:25 UTC (permalink / raw)
To: yoshfuji; +Cc: dlezcano, netdev
From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Wed, 06 Feb 2008 21:31:00 +1100 (EST)
> In article <20080206092300.701741592@mai.toulouse-stg.fr.ibm.com> (at Wed, 06 Feb 2008 10:14:19 +0100), Daniel Lezcano <dlezcano@fr.ibm.com> says:
>
> > replace __inline__ by inline in include/linux (net related)
> >
> > Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
> > ---
> > include/linux/atm.h | 4 ++--
> > include/linux/atmsap.h | 2 +-
> > include/linux/hdlc.h | 13 +++++++------
> > include/linux/inetdevice.h | 14 ++++++--------
> > include/linux/netlink.h | 5 +++--
> > include/linux/rtnetlink.h | 2 +-
> > 6 files changed, 20 insertions(+), 20 deletions(-)
>
> Please do this change within the #ifdef __KERNEL__ .. #endif only.
What is the harm in fixing the user exposable portions?
There is exactly zero risk as far as I can see.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 00/14] replace __inline__ by inline in net code
2008-02-06 9:14 [patch 00/14] replace __inline__ by inline in net code Daniel Lezcano
` (13 preceding siblings ...)
2008-02-06 9:14 ` [patch 14/14] replace __inline__ by inline in include/linux (net related) Daniel Lezcano
@ 2008-02-06 11:29 ` David Miller
14 siblings, 0 replies; 21+ messages in thread
From: David Miller @ 2008-02-06 11:29 UTC (permalink / raw)
To: dlezcano; +Cc: netdev
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Wed, 06 Feb 2008 10:14:05 +0100
> The following patchset replaces all occurences of __inline__
> by inline and make some minor coding style fixes.
>
> It touches:
> . net/* files
> . include/net/* files
> . include/linux/* files (only the ones related to the network)
>
> The patchset touches a lot of files and that can probably increase
> the patch conflict probability, but I have this patchset since a
> few days, I didn't noticed any problem when updating net-2.6 and I
> hope that will be still the case.
> IMHO, it is the right moment to send this patch out, since net-2.6.25
> is closed and net-2.6.26 is not yet opened.
You have a point, but you also don't.
This makes debugging much harder since they not only have to go
through the real changes, they also have to go through transformations
like this one.
I'd much rather queue this up into net-2.6.26 when I open that up and
deal with whatever rejects. For trivial transformations like this I
can resolve the rejects with my eyes closed. :-)
^ permalink raw reply [flat|nested] 21+ messages in thread