From: David S. Miller Date: Fri, 16 May 2014 19:13:18 +0000 (-0400) Subject: Merge branch 'mlx4-net' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0c2e3fa9583192b0255fa9ec0260350e6ed202bd;p=deliverable%2Flinux.git Merge branch 'mlx4-net' Or Gerlitz says: ==================== mlx4: Fix VF MAC address change under RoCE usage This short series provides proper handling for the case where a VF netdevice change their MAC address under a RoCE use case. The code it deals with was introduced in 3.15-rc1 Prior to this series the source MAC used for the VM RoCE CM packets remains as before the MAC modification. Hence RoCE CM packets sent by the VF will not carry the same source MAC address as the non-CM packets. Earlier 3.15-rc commit f24f790 "net/mlx4_core: Load the Eth driver first" handled just one instance of the problem, but this one provides a more generic and proper solution which covers all cases of VF mac change. ==================== Signed-off-by: David S. Miller --- 0c2e3fa9583192b0255fa9ec0260350e6ed202bd