Commit 723783d0 authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller

sock: remove one redundant SKB_FRAG_PAGE_ORDER macro

Both SKB_FRAG_PAGE_ORDER are defined to the same value in
net/core/sock.c and drivers/vhost/net.c.

Move the SKB_FRAG_PAGE_ORDER definition to net/core/sock.h,
as both net/core/sock.c and drivers/vhost/net.c include it,
and it seems a reasonable file to put the macro.
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e8243e6
...@@ -643,8 +643,6 @@ static bool tx_can_batch(struct vhost_virtqueue *vq, size_t total_len) ...@@ -643,8 +643,6 @@ static bool tx_can_batch(struct vhost_virtqueue *vq, size_t total_len)
!vhost_vq_avail_empty(vq->dev, vq); !vhost_vq_avail_empty(vq->dev, vq);
} }
#define SKB_FRAG_PAGE_ORDER get_order(32768)
static bool vhost_net_page_frag_refill(struct vhost_net *net, unsigned int sz, static bool vhost_net_page_frag_refill(struct vhost_net *net, unsigned int sz,
struct page_frag *pfrag, gfp_t gfp) struct page_frag *pfrag, gfp_t gfp)
{ {
......
...@@ -2717,6 +2717,7 @@ extern int sysctl_optmem_max; ...@@ -2717,6 +2717,7 @@ extern int sysctl_optmem_max;
extern __u32 sysctl_wmem_default; extern __u32 sysctl_wmem_default;
extern __u32 sysctl_rmem_default; extern __u32 sysctl_rmem_default;
#define SKB_FRAG_PAGE_ORDER get_order(32768)
DECLARE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key); DECLARE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key);
static inline int sk_get_wmem0(const struct sock *sk, const struct proto *proto) static inline int sk_get_wmem0(const struct sock *sk, const struct proto *proto)
......
...@@ -2574,7 +2574,6 @@ static void sk_leave_memory_pressure(struct sock *sk) ...@@ -2574,7 +2574,6 @@ static void sk_leave_memory_pressure(struct sock *sk)
} }
} }
#define SKB_FRAG_PAGE_ORDER get_order(32768)
DEFINE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key); DEFINE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key);
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment