diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-11-02 20:27:12 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-02 20:27:12 +0900 |
| commit | 6e1a2882c6dcb680fb8776062719f51d95a0ec0b (patch) | |
| tree | 8c7c438525d0cb7fa86d56e451b05373e80fe461 /drivers/net/ethernet/netronome/nfp/flower/cmsg.h | |
| parent | tools: bpf: handle long path in jit disasm (diff) | |
| parent | nfp: improve defines for constants in ethtool (diff) | |
| download | linux-dev-6e1a2882c6dcb680fb8776062719f51d95a0ec0b.tar.xz linux-dev-6e1a2882c6dcb680fb8776062719f51d95a0ec0b.zip | |
Merge branch 'nfp-TC-block-fixes-app-fallback-and-dev_alloc'
Jakub Kicinski says:
====================
nfp: TC block fixes, app fallback and dev_alloc()
This series has three parts. First of all John and I fix some
fallout from the TC block conversion. John also fixes sleeping
in the neigh notifier.
Secondly I reorganise the nfp_app table to make it easier to
deal with excluding apps which have unmet Kconfig dependencies.
Last but not least after the fixes which went into -net some time
ago I refactor the page allocation, add a ethtool counter for
failed allocations and clean the ethtool stat code while at it.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/flower/cmsg.h')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h index 64e87f8e7089..66070741d55f 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h @@ -458,6 +458,6 @@ void nfp_flower_cmsg_process_rx(struct work_struct *work); void nfp_flower_cmsg_rx(struct nfp_app *app, struct sk_buff *skb); struct sk_buff * nfp_flower_cmsg_alloc(struct nfp_app *app, unsigned int size, - enum nfp_flower_cmsg_type_port type); + enum nfp_flower_cmsg_type_port type, gfp_t flag); #endif |