Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
"Fix a regression in the qat driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: qat - do not handle PFVF sources for qat_4xxx

+7
+7
drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c
··· 211 211 return adf_4xxx_fw_config[obj_num].ae_mask; 212 212 } 213 213 214 + static u32 get_vf2pf_sources(void __iomem *pmisc_addr) 215 + { 216 + /* For the moment do not report vf2pf sources */ 217 + return 0; 218 + } 219 + 214 220 void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data) 215 221 { 216 222 hw_data->dev_class = &adf_4xxx_class; ··· 260 254 hw_data->set_msix_rttable = set_msix_default_rttable; 261 255 hw_data->set_ssm_wdtimer = adf_gen4_set_ssm_wdtimer; 262 256 hw_data->enable_pfvf_comms = pfvf_comms_disabled; 257 + hw_data->get_vf2pf_sources = get_vf2pf_sources; 263 258 hw_data->disable_iov = adf_disable_sriov; 264 259 hw_data->min_iov_compat_ver = ADF_PFVF_COMPAT_THIS_VERSION; 265 260