diff --git a/crypto/algboss.c b/crypto/algboss.c index 5e6df2a..6ec2ce3 100644 --- a/crypto/algboss.c +++ b/crypto/algboss.c @@ -90,6 +90,8 @@ out: crypto_alg_put(¶m->larval->alg); kfree(param); module_put_and_exit(0); + + return 0; } static int cryptomgr_schedule_probe(struct crypto_larval *larval) @@ -227,6 +229,8 @@ skiptest: kfree(param); module_put_and_exit(0); + + return 0; } static int cryptomgr_schedule_test(struct crypto_alg *alg) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index 7bd704a..d329673 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -549,6 +549,8 @@ static struct scatterlist *alloc_sgtable(int size) void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt) { + return; + struct iwl_fw_error_dump_file *dump_file; struct iwl_fw_error_dump_data *dump_data; struct iwl_fw_error_dump_info *dump_info; @@ -1106,6 +1108,8 @@ IWL_EXPORT_SYMBOL(iwl_fw_start_dbg_conf); void iwl_fw_error_dump_wk(struct work_struct *work) { + return; + struct iwl_fw_runtime *fwrt = container_of(work, struct iwl_fw_runtime, dump.wk.work); diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 9c4a7f6..3bf610f 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1776,6 +1776,7 @@ MODULE_PARM_DESC(debug, "debug output mask"); module_param_named(swcrypto, iwlwifi_mod_params.swcrypto, int, S_IRUGO); MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])"); module_param_named(11n_disable, iwlwifi_mod_params.disable_11n, uint, S_IRUGO); +unsigned int *module_param_11n_disable = &iwlwifi_mod_params.disable_11n; MODULE_PARM_DESC(11n_disable, "disable 11n functionality, bitmap: 1: full, 2: disable agg TX, 4: disable agg RX, 8 enable agg TX"); module_param_named(amsdu_size, iwlwifi_mod_params.amsdu_size, diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/led.c b/drivers/net/wireless/intel/iwlwifi/mvm/led.c index b272695..143130d 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/led.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/led.c @@ -142,7 +142,7 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm) if (ret) { kfree(mvm->led.name); IWL_INFO(mvm, "Failed to enable led\n"); - return ret; + return 0; } mvm->init_status |= IWL_MVM_INIT_STATUS_LEDS_INIT_COMPLETE; diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 7152fdc..5d133e5 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -4368,7 +4368,7 @@ const struct ieee80211_ops iwl_mvm_hw_ops = { .add_interface = iwl_mvm_mac_add_interface, .remove_interface = iwl_mvm_mac_remove_interface, .config = iwl_mvm_mac_config, - .prepare_multicast = iwl_mvm_prepare_multicast, + .prepare_multicast = 0, .configure_filter = iwl_mvm_configure_filter, .config_iface_filter = iwl_mvm_config_iface_filter, .bss_info_changed = iwl_mvm_bss_info_changed, diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c index f25ce3a..85007fc 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c @@ -1601,7 +1601,7 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id) * Re-enable interrupts here since we don't * have anything to service */ - if (test_bit(STATUS_INT_ENABLED, &trans->status)) + // if (test_bit(STATUS_INT_ENABLED, &trans->status)) _iwl_enable_interrupts(trans); spin_unlock(&trans_pcie->irq_lock); lock_map_release(&trans->sync_cmd_lockdep_map); diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 99df171..4632cdf 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3781,7 +3781,7 @@ static inline void skb_remcsum_process(struct sk_buff *skb, void *ptr, if (unlikely(skb->ip_summed != CHECKSUM_COMPLETE)) { __skb_checksum_complete(skb); - skb_postpull_rcsum(skb, skb->data, ptr - (void *)skb->data); + skb_postpull_rcsum(skb, skb->data, (unsigned char*)ptr - skb->data); } delta = remcsum_adjust(ptr, skb->csum, start, offset); diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index e0f3f4a..a309257 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3977,6 +3977,8 @@ static int packet_notifier(struct notifier_block *this, struct net_device *dev = netdev_notifier_info_to_dev(ptr); struct net *net = dev_net(dev); +// XXX check if still needed +#if 0 rcu_read_lock(); sk_for_each_rcu(sk, &net->packet.sklist) { struct packet_sock *po = pkt_sk(sk); @@ -4017,6 +4019,7 @@ static int packet_notifier(struct notifier_block *this, } } rcu_read_unlock(); +#endif return NOTIFY_DONE; } @@ -4544,8 +4547,10 @@ static int __net_init packet_net_init(struct net *net) mutex_init(&net->packet.sklist_lock); INIT_HLIST_HEAD(&net->packet.sklist); +#ifdef CONFIG_PROC_FS if (!proc_create("packet", 0, net->proc_net, &packet_seq_fops)) return -ENOMEM; +#endif return 0; }