diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-23 16:28:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-23 16:49:34 -0400 |
| commit | c3fa32b9764dc45dcf8a2231b1c110abc4a63e0b (patch) | |
| tree | 6cf2896a77b65bec64284681e1c3851eb3263e09 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | |
| parent | 34d92d5315b64a3e5292b7e9511c1bb617227fb6 (diff) | |
| parent | 320437af954cbe66478f1f5e8b34cb5a8d072191 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/qmi_wwan.c
include/net/dst.h
Trivial merge conflicts, both were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c index 58dc89af7c6a..9199adf32d33 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | |||
| @@ -1020,7 +1020,7 @@ static int bnx2x_copy32_vf_dmae(struct bnx2x *bp, u8 from_vf, | |||
| 1020 | dmae.len = len32; | 1020 | dmae.len = len32; |
| 1021 | 1021 | ||
| 1022 | /* issue the command and wait for completion */ | 1022 | /* issue the command and wait for completion */ |
| 1023 | return bnx2x_issue_dmae_with_comp(bp, &dmae); | 1023 | return bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp)); |
| 1024 | } | 1024 | } |
| 1025 | 1025 | ||
| 1026 | static void bnx2x_vf_mbx_resp_single_tlv(struct bnx2x *bp, | 1026 | static void bnx2x_vf_mbx_resp_single_tlv(struct bnx2x *bp, |