Comment 3 for bug 1397863

Cherry picked these patches (except for df8a39defad46b83694ea6dd868d332976d62cc0):

git log --pretty=oneline --reverse v3.19..HEAD -- drivers/net/ethernet/intel/fm10k
df8a39defad46b83694ea6dd868d332976d62cc0 net: rename vlan_tx_* helpers since "tx" is misleading there
ba5b8dcdb865efaa35692516a7153dc631ba6ffa fm10k: Clean-up page reuse code
e2929e453a1dddf489cc8bc360eb207df39d196c net/fm10k: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask
b66b6d9f6dbe0655a570fb2a2482cceac5f1a9bc fm10k: Check tunnel header length in encap offload
b4a9d6f17335ebd4d09f702cfffa059057ec238c fm10k: Increase the timeout for the data path reset
33a44c2873ba64c54d11a9364b6b43271761d245 fm10k: Validate VLAN ID in fm10k_update_xc_addr_pf
f4a80f1ef7ba70f24d28f78706965f9871ac1d9f fm10k: Resolve compile warnings with W=1