forked from Minki/linux
7289e26f39
-----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmAppPgeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGeXYH/imZPBd4A1jIMehN 5HV2A53Z+MXmmaMuGj9X1KV6vsf55/xB+IhOoFdtRAIsO8c2yYSCO8i4+4R0XfYA +/YFJeq672rojQnmh6XbpR8dugaAV7CUHy6n7KDsyvtT6EOCpwFSwkOb4X3tBRX6 TlYgm2d/xgV/wRHSgLVugK0MdFCLMAnyb7mkPfar9QrMgG1BiDKLq07xmwnS23On TkqpJ9yZ/rJpUrrUqQYPShSO/FmA+fSfWs0CDv7EIrJ40LUScD6PZxSHWTIHtjLk E4jFda6wuqLRVWsBwaBzUIdD0zk7X5quHRzEpbC5ga16SK6yrWvE5YJJXCguIEuZ f3FMRYs= =CAjn -----END PGP SIGNATURE----- Merge tag 'v5.11' into rdma.git for-next Linux 5.11 Merged to resolve conflicts with RDMA rc commits - drivers/infiniband/sw/rxe/rxe_net.c The final logic is to call rxe_get_dev_from_net() again with the master netdev if the packet was rx'd on a vlan. To keep the elimination of the local variables requires a trivial edit to the code in -rc Link: https://lore.kernel.org/r/20210210131542.215ea67c@canb.auug.org.au Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| rxe_av.c | ||
| rxe_comp.c | ||
| rxe_cq.c | ||
| rxe_hdr.h | ||
| rxe_hw_counters.c | ||
| rxe_hw_counters.h | ||
| rxe_icrc.c | ||
| rxe_loc.h | ||
| rxe_mcast.c | ||
| rxe_mmap.c | ||
| rxe_mr.c | ||
| rxe_net.c | ||
| rxe_net.h | ||
| rxe_opcode.c | ||
| rxe_opcode.h | ||
| rxe_param.h | ||
| rxe_pool.c | ||
| rxe_pool.h | ||
| rxe_qp.c | ||
| rxe_queue.c | ||
| rxe_queue.h | ||
| rxe_recv.c | ||
| rxe_req.c | ||
| rxe_resp.c | ||
| rxe_srq.c | ||
| rxe_sysfs.c | ||
| rxe_task.c | ||
| rxe_task.h | ||
| rxe_verbs.c | ||
| rxe_verbs.h | ||
| rxe.c | ||
| rxe.h | ||