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

Commit 6f7c156c authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

tun: dont force inline of functions 



Current standard practice is to not mark most functions as inline
and  let compiler decide instead.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a504b86e

drivers/net/tun.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -550,7 +550,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait) 




/* prepad is the amount to reserve at front.  len is length after that.

/* prepad is the amount to reserve at front.  len is length after that.

 * linear is a hint as to how much to copy (usually headers). */

 * linear is a hint as to how much to copy (usually headers). */

static inline struct sk_buff *tun_alloc_skb(struct tun_struct *tun,

static struct sk_buff *tun_alloc_skb(struct tun_struct *tun,

				     size_t prepad, size_t len,

				     size_t prepad, size_t len,

				     size_t linear, int noblock)

				     size_t linear, int noblock)

{

{
@@ -578,7 +578,7 @@ static inline struct sk_buff *tun_alloc_skb(struct tun_struct *tun, 
}

}





/* Get packet from user space buffer */

/* Get packet from user space buffer */

static __inline__ ssize_t tun_get_user(struct tun_struct *tun,

static ssize_t tun_get_user(struct tun_struct *tun,

			    const struct iovec *iv, size_t count,

			    const struct iovec *iv, size_t count,

			    int noblock)

			    int noblock)

{

{
@@ -729,7 +729,7 @@ static ssize_t tun_chr_aio_write(struct kiocb *iocb, const struct iovec *iv, 
}

}





/* Put packet to the user space buffer */

/* Put packet to the user space buffer */

static __inline__ ssize_t tun_put_user(struct tun_struct *tun,

static ssize_t tun_put_user(struct tun_struct *tun,

			    struct sk_buff *skb,

			    struct sk_buff *skb,

			    const struct iovec *iv, int len)

			    const struct iovec *iv, int len)

{

{