replace __inline__ by inline in net/core Signed-off-by: Daniel Lezcano --- 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 || -- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html