virtio-net: realign page_to_skb() after merges

virtio-net: realign page_to_skb() after merges

We ended up merging two versions of the same patch set:

commit a2d7d342d7cf ("virtio_net: get build_skb() buf by data ptr")
commit 46544a61a896 ("virtio-net: fix for unable to handle page fault for address")

into net, and

commit d9b2caafda2c ("virtio-net: get build_skb() buf by data ptr")
commit 3fc5c0caa67a ("virtio-net: fix for unable to handle page fault for address")

into net-next. Redo the merge from commit 3d033a84bff7 ("Merge
ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net"), so that
the most recent code remains.

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>