diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2011-06-08 14:33:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-09 00:08:39 -0700 |
| commit | 6f7c156c08d5eaa9fff2bd062f0a2b9d09a1e7a9 (patch) | |
| tree | 6132ae6aa5fadcb9566e5b50d4a4ad1a39323e79 | |
| parent | a504b86e718a425ea4a34e2f95b5cf0545ddfd8d (diff) | |
| download | linux-3.10-6f7c156c08d5eaa9fff2bd062f0a2b9d09a1e7a9.tar.gz linux-3.10-6f7c156c08d5eaa9fff2bd062f0a2b9d09a1e7a9.tar.bz2 linux-3.10-6f7c156c08d5eaa9fff2bd062f0a2b9d09a1e7a9.zip | |
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: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/tun.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 17db1942063..2829badbae3 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -550,9 +550,9 @@ 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. * linear is a hint as to how much to copy (usually headers). */ -static inline struct sk_buff *tun_alloc_skb(struct tun_struct *tun, - size_t prepad, size_t len, - size_t linear, int noblock) +static struct sk_buff *tun_alloc_skb(struct tun_struct *tun, + size_t prepad, size_t len, + size_t linear, int noblock) { struct sock *sk = tun->socket.sk; struct sk_buff *skb; @@ -578,9 +578,9 @@ static inline struct sk_buff *tun_alloc_skb(struct tun_struct *tun, } /* Get packet from user space buffer */ -static __inline__ ssize_t tun_get_user(struct tun_struct *tun, - const struct iovec *iv, size_t count, - int noblock) +static ssize_t tun_get_user(struct tun_struct *tun, + const struct iovec *iv, size_t count, + int noblock) { struct tun_pi pi = { 0, cpu_to_be16(ETH_P_IP) }; struct sk_buff *skb; @@ -729,9 +729,9 @@ static ssize_t tun_chr_aio_write(struct kiocb *iocb, const struct iovec *iv, } /* Put packet to the user space buffer */ -static __inline__ ssize_t tun_put_user(struct tun_struct *tun, - struct sk_buff *skb, - const struct iovec *iv, int len) +static ssize_t tun_put_user(struct tun_struct *tun, + struct sk_buff *skb, + const struct iovec *iv, int len) { struct tun_pi pi = { 0, skb->protocol }; ssize_t total = 0; |