diff options
author | David S. Miller <davem@davemloft.net> | 2017-01-17 21:19:37 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-17 21:19:37 +0100 |
commit | 580bdf5650fff8f66468ce491f8308f1117b7074 (patch) | |
tree | 3570ba1406f8cf492308d07cd88d3e53742a69f2 /net/tipc/msg.h | |
parent | Merge branch 'mpls-packet-stats' (diff) | |
parent | stmmac: add missing of_node_put (diff) | |
download | linux-580bdf5650fff8f66468ce491f8308f1117b7074.tar.xz linux-580bdf5650fff8f66468ce491f8308f1117b7074.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/tipc/msg.h')
-rw-r--r-- | net/tipc/msg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 850ae0e469f5..f07b51e3f6f1 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h @@ -818,7 +818,7 @@ static inline bool msg_is_reset(struct tipc_msg *hdr) return (msg_user(hdr) == LINK_PROTOCOL) && (msg_type(hdr) == RESET_MSG); } -struct sk_buff *tipc_buf_acquire(u32 size); +struct sk_buff *tipc_buf_acquire(u32 size, gfp_t gfp); bool tipc_msg_validate(struct sk_buff *skb); bool tipc_msg_reverse(u32 own_addr, struct sk_buff **skb, int err); void tipc_msg_init(u32 own_addr, struct tipc_msg *m, u32 user, u32 type, |