From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 01:34:02 +0000 (+1000)
Subject: Merge remote-tracking branch 'net-next/master'
X-Git-Tag: next-20140530~74
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af49dc02ea1b970a5d09e905213b82a3020daea9;p=karo-tx-linux.git

Merge remote-tracking branch 'net-next/master'

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c
---

af49dc02ea1b970a5d09e905213b82a3020daea9
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 8735ef1f44ae,32682edfe5a4..392367204877
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -826,9 -825,8 +825,8 @@@ static int iwl_mvm_mac_add_interface(st
  	if (ret)
  		goto out_remove_mac;
  
 -	if (!mvm->bf_allowed_vif &&
 +	if (!mvm->bf_allowed_vif && false &&
- 	    vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
- 	    mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED){
+ 	    vif->type == NL80211_IFTYPE_STATION && !vif->p2p) {
  		mvm->bf_allowed_vif = mvmvif;
  		vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |
  				     IEEE80211_VIF_SUPPORTS_CQM_RSSI;
diff --cc drivers/s390/net/qeth_core_main.c
index e89f38c31176,34993009a9e1..7b7a686abefc
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@@ -20,9 -20,9 +20,10 @@@
  #include <linux/kthread.h>
  #include <linux/slab.h>
  #include <net/iucv/af_iucv.h>
+ #include <net/dsfield.h>
  
  #include <asm/ebcdic.h>
 +#include <asm/chpid.h>
  #include <asm/io.h>
  #include <asm/sysinfo.h>
  #include <asm/compat.h>