diff options
| author | David S. Miller | 2018-07-03 03:26:50 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-07-03 03:29:26 +0200 |
| commit | 5cd3da4ba2397ef07226ca2aa5094ed21ff8198f (patch) | |
| tree | caa3c5968df02c296e9644a98c00e759d011b44c /drivers/net/ethernet/netronome/nfp/nfpcore | |
| parent | Merge branch 'hns3-a-few-code-improvements' (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| download | kernel-qcow2-linux-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.tar.gz kernel-qcow2-linux-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.tar.xz kernel-qcow2-linux-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Simple overlapping changes in stmmac driver.
Adjust skb_gro_flush_final_remcsum function signature to make GRO list
changes in net-next, as per Stephen Rothwell's example merge
resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfpcore')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c index cd34097b79f1..37a6d7822a38 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c @@ -232,7 +232,7 @@ struct nfp_nffw_info *nfp_nffw_info_open(struct nfp_cpp *cpp) err = nfp_cpp_read(cpp, nfp_resource_cpp_id(state->res), nfp_resource_address(state->res), fwinf, sizeof(*fwinf)); - if (err < sizeof(*fwinf)) + if (err < (int)sizeof(*fwinf)) goto err_release; if (!nffw_res_flg_init_get(fwinf)) |