diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-11-29 20:47:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-29 20:47:48 -0800 |
| commit | 60b7379dc5b1743427b031cca53e30860a38ada6 (patch) | |
| tree | c0462b8dd188861bd04f36dd31672b7446e35dd8 /net/packet/af_packet.c | |
| parent | macvlan: delay the header check for dodgy packets into lower device (diff) | |
| parent | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| download | linux-dev-60b7379dc5b1743427b031cca53e30860a38ada6.tar.xz linux-dev-60b7379dc5b1743427b031cca53e30860a38ada6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/packet/af_packet.c')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index dfb148e9fdaa..efa844501136 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -378,7 +378,7 @@ static void unregister_prot_hook(struct sock *sk, bool sync) __unregister_prot_hook(sk, sync); } -static inline __pure struct page *pgv_to_page(void *addr) +static inline struct page * __pure pgv_to_page(void *addr) { if (is_vmalloc_addr(addr)) return vmalloc_to_page(addr); |