linux-next: manual merge of the staging tree with the wireless tree

linux-next: manual merge of the staging tree with the wireless tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c between commit
e2117cea27c6b27e1a379acac5eb0433eeb7033a ("staging: rtl8192su: fix
compile error from wireless-testing commit") from the wireless tree and
commit 7332868b1aea2a5900a70acadf767f7632b1c2c2 ("Staging: rtl8187x: Use %
pM for mac address output") from the staging tree.

Just context changes.  I fixed it up (see below) and can carry the fix
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
index 095b8c6,67b99ad..0000000
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
@@@ -2366,11 -2366,11 +2366,11 @@@ static inline void ieee80211_process_pr
  		(beacon->capability & (1<<0x0)) ? '1' : '0');
  
  	if (ieee80211_network_init(ieee, beacon, &network, stats)) {
- 		IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",
+ 		IEEE80211_DEBUG_SCAN("Dropped '%s' (%pM) via %s.\n",
  				     escape_essid(info_element->data,
  						  info_element->len),
- 				     MAC_ARG(beacon->header.addr3),
+ 				     beacon->header.addr3,
 -				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
 +				     WLAN_FC_GET_STYPE(beacon->header.frame_control) ==
  				     IEEE80211_STYPE_PROBE_RESP ?
  				     "PROBE RESPONSE" : "BEACON");
  		return;
@@@ -2492,11 -2492,11 +2492,11 @@@
  
  
  #ifdef CONFIG_IEEE80211_DEBUG
- 		IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n",
+ 		IEEE80211_DEBUG_SCAN("Adding '%s' (%pM) via %s.\n",
  				     escape_essid(network.ssid,
  						  network.ssid_len),
- 				     MAC_ARG(network.bssid),
+ 				     network.bssid,
 -				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
 +				     WLAN_FC_GET_STYPE(beacon->header.frame_control) ==
  				     IEEE80211_STYPE_PROBE_RESP ?
  				     "PROBE RESPONSE" : "BEACON");
  #endif
@@@ -2505,11 -2505,11 +2505,11 @@@
  		if(ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)
  			ieee80211_softmac_new_net(ieee,&network);
  	} else {
- 		IEEE80211_DEBUG_SCAN("Updating '%s' (" MAC_FMT ") via %s.\n",
+ 		IEEE80211_DEBUG_SCAN("Updating '%s' (%pM) via %s.\n",
  				     escape_essid(target->ssid,
  						  target->ssid_len),
- 				     MAC_ARG(target->bssid),
+ 				     target->bssid,
 -				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
 +				     WLAN_FC_GET_STYPE(beacon->header.frame_control) ==
  				     IEEE80211_STYPE_PROBE_RESP ?
  				     "PROBE RESPONSE" : "BEACON");
  

Re: linux-next: manual merge of the staging tree with the wireless tree

[Greg KH]

On Mon, Feb 22, 2010 at 04:31:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c between commit
> e2117cea27c6b27e1a379acac5eb0433eeb7033a ("staging: rtl8192su: fix
> compile error from wireless-testing commit") from the wireless tree and
> commit 7332868b1aea2a5900a70acadf767f7632b1c2c2 ("Staging: rtl8187x: Use %
> pM for mac address output") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> as necessary.

Looks good to me, thanks for doing this.

greg k-h

linux-next: manual merge of the staging tree with the wireless tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c between commit
7bb4568372856688bc070917265bce0b88bb7d4d ("mac80211: make tx() operation
return void") from the wireless tree (where this file is called
drivers/staging/brcm80211/sys/wl_mac80211.c) and commits
62b54dca17ef40116491b0ca27ca35fbe9daedc6 ("staging: brcm80211: cleanup
function prototypes in header files") and
55182a10063c40eda4dc5afecff712e5c3617ffc ("staging: brcm80211: cosmetic
changes") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 6363077,6059e4c..0000000
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@@ -104,7 -75,16 +75,13 @@@ static int wl_request_fw(struct wl_inf
  static void wl_release_fw(struct wl_info *wl);
  
  /* local prototypes */
 -static int wl_start(struct sk_buff *skb, struct wl_info *wl);
 -static int wl_start_int(struct wl_info *wl, struct ieee80211_hw *hw,
 -			struct sk_buff *skb);
  static void wl_dpc(unsigned long data);
+ static irqreturn_t wl_isr(int irq, void *dev_id);
+ 
+ static int __devinit wl_pci_probe(struct pci_dev *pdev,
+ 				  const struct pci_device_id *ent);
+ static void wl_remove(struct pci_dev *pdev);
+ static void wl_free(struct wl_info *wl);
  
  MODULE_AUTHOR("Broadcom Corporation");
  MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
@@@ -132,6 -110,9 +107,8 @@@ module_param(phymsglevel, int, 0)
  
  #define HW_TO_WL(hw)	 (hw->priv)
  #define WL_TO_HW(wl)	  (wl->pub->ieee_hw)
+ 
+ /* MAC80211 callback functions */
 -static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
  static int wl_ops_start(struct ieee80211_hw *hw);
  static void wl_ops_stop(struct ieee80211_hw *hw);
  static int wl_ops_add_interface(struct ieee80211_hw *hw,
@@@ -161,17 -142,22 +138,21 @@@ static void wl_ops_sta_notify(struct ie
  static int wl_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,
  			  const struct ieee80211_tx_queue_params *params);
  static u64 wl_ops_get_tsf(struct ieee80211_hw *hw);
- static int wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ static int wl_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
  		      struct ieee80211_sta *sta);
- static int wl_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ static int wl_ops_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
  			 struct ieee80211_sta *sta);
- static int wl_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
- 			   enum ieee80211_ampdu_mlme_action action,
- 			   struct ieee80211_sta *sta, u16 tid, u16 *ssn);
+ static int wl_ops_ampdu_action(struct ieee80211_hw *hw,
+ 			       struct ieee80211_vif *vif,
+ 			       enum ieee80211_ampdu_mlme_action action,
+ 			       struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+ 			       u8 buf_size);
+ static void wl_ops_rfkill_poll(struct ieee80211_hw *hw);
  
 -static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 +static void wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
  {
 -	int status;
  	struct wl_info *wl = hw->priv;
+ 
  	WL_LOCK(wl);
  	if (!wl->pub->up) {
  		WL_ERROR("ops->tx called while down\n");
@@@ -1319,6 -1401,28 +1395,9 @@@ static void wl_free(struct wl_info *wl
  	osl_detach(osh);
  }
  
+ /*
 - * transmit a packet
 - * precondition: perimeter lock has been acquired
 - */
 -static int BCMFASTPATH wl_start(struct sk_buff *skb, struct wl_info *wl)
 -{
 -	if (!wl)
 -		return -ENETDOWN;
 -
 -	return wl_start_int(wl, WL_TO_HW(wl), skb);
 -}
 -
 -static int BCMFASTPATH
 -wl_start_int(struct wl_info *wl, struct ieee80211_hw *hw, struct sk_buff *skb)
 -{
 -	wlc_sendpkt_mac80211(wl->wlc, skb, hw);
 -	return NETDEV_TX_OK;
 -}
 -
 -/*
+  * precondition: perimeter lock has been acquired
+  */
  void wl_txflowcontrol(struct wl_info *wl, struct wl_if *wlif, bool state,
  		      int prio)
  {

Re: linux-next: manual merge of the staging tree with the wireless tree

[Greg KH]

On Wed, Mar 02, 2011 at 05:27:54PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmsmac/wl_mac80211.c between commit
> 7bb4568372856688bc070917265bce0b88bb7d4d ("mac80211: make tx() operation
> return void") from the wireless tree (where this file is called
> drivers/staging/brcm80211/sys/wl_mac80211.c) and commits
> 62b54dca17ef40116491b0ca27ca35fbe9daedc6 ("staging: brcm80211: cleanup
> function prototypes in header files") and
> 55182a10063c40eda4dc5afecff712e5c3617ffc ("staging: brcm80211: cosmetic
> changes") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, that looks good to me.

greg k-h

Re: linux-next: manual merge of the staging tree with the wireless tree

[Arend van Spriel]

On Wed, 02 Mar 2011 07:27:54 +0100, Stephen Rothwell  
<sfr@canb.auug.org.au> wrote:

> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmsmac/wl_mac80211.c between commit
> 7bb4568372856688bc070917265bce0b88bb7d4d ("mac80211: make tx() operation
> return void") from the wireless tree (where this file is called
> drivers/staging/brcm80211/sys/wl_mac80211.c) and commits
> 62b54dca17ef40116491b0ca27ca35fbe9daedc6 ("staging: brcm80211: cleanup
> function prototypes in header files") and
> 55182a10063c40eda4dc5afecff712e5c3617ffc ("staging: brcm80211: cosmetic
> changes") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

I saw functions being removed. Checked the modified wl_ops_tx on  
git.kernel.org and it looks fine to me.

Thanks,
AvS
-- 
"The most merciful thing in the world, I think, is the inability of the  
human
mind to correlate all its contents." - "The Call of Cthulhu"

linux-next: manual merge of the staging tree with the wireless tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c between commit
5a083c0aba95 ("cfg80211: Use consistent BSS matching between scan and
sme") from the wireless tree and commit e494632efcd9 ("staging:
brcm80211: Fixed bss (re)connect/disconnect issues in brcmfmac driver")
from the staging tree.

I fixed it up (see below) anc can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 7aaf99c,e3b409b..0000000
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@@ -2627,17 -2863,20 +2863,19 @@@ wl_bss_roaming_done(struct wl_priv *wl
  	struct wl_connect_info *conn_info = wl_to_conn(wl);
  	s32 err = 0;
  
+ 	WL_TRACE("Enter\n");
+ 
  	wl_get_assoc_ies(wl);
- 	memcpy(&wl->bssid, &e->addr, ETH_ALEN);
+ 	wl_update_prof(wl, NULL, &e->addr, WL_PROF_BSSID);
  	wl_update_bss_info(wl);
 -
 -	cfg80211_roamed(ndev,
 +	cfg80211_roamed(ndev, NULL,
- 			(u8 *)&wl->bssid,
+ 			(u8 *)wl_read_prof(wl, WL_PROF_BSSID),
  			conn_info->req_ie, conn_info->req_ie_len,
  			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
- 	WL_DBG("Report roaming result\n");
+ 	WL_CONN("Report roaming result\n");
  
  	set_bit(WL_STATUS_CONNECTED, &wl->status);
- 
+ 	WL_TRACE("Exit\n");
  	return err;
  }
  

Re: linux-next: manual merge of the staging tree with the wireless tree

[Greg KH]

On Wed, May 18, 2011 at 12:56:33PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c between commit
> 5a083c0aba95 ("cfg80211: Use consistent BSS matching between scan and
> sme") from the wireless tree and commit e494632efcd9 ("staging:
> brcm80211: Fixed bss (re)connect/disconnect issues in brcmfmac driver")
> from the staging tree.
> 
> I fixed it up (see below) anc can carry the fix as necessary.

Looks great to me, thanks for doing this.

greg k-h

RE: linux-next: manual merge of the staging tree with the wireless tree

[Sukesh Srikakula]

Hi Stephen,

Thanks for merging. 
Merge looks to be fine.

Regards,
Sukesh.

-----Original Message-----
From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] 
Sent: Tuesday, May 17, 2011 7:57 PM
To: Greg KH
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Jouni Malinen; Sukesh Srikakula; Arend Van Spriel
Subject: linux-next: manual merge of the staging tree with the wireless tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c between commit
5a083c0aba95 ("cfg80211: Use consistent BSS matching between scan and
sme") from the wireless tree and commit e494632efcd9 ("staging:
brcm80211: Fixed bss (re)connect/disconnect issues in brcmfmac driver")
from the staging tree.

I fixed it up (see below) anc can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 7aaf99c,e3b409b..0000000
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@@ -2627,17 -2863,20 +2863,19 @@@ wl_bss_roaming_done(struct wl_priv *wl
  	struct wl_connect_info *conn_info = wl_to_conn(wl);
  	s32 err = 0;
  
+ 	WL_TRACE("Enter\n");
+ 
  	wl_get_assoc_ies(wl);
- 	memcpy(&wl->bssid, &e->addr, ETH_ALEN);
+ 	wl_update_prof(wl, NULL, &e->addr, WL_PROF_BSSID);
  	wl_update_bss_info(wl);
 -
 -	cfg80211_roamed(ndev,
 +	cfg80211_roamed(ndev, NULL,
- 			(u8 *)&wl->bssid,
+ 			(u8 *)wl_read_prof(wl, WL_PROF_BSSID),
  			conn_info->req_ie, conn_info->req_ie_len,
  			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
- 	WL_DBG("Report roaming result\n");
+ 	WL_CONN("Report roaming result\n");
  
  	set_bit(WL_STATUS_CONNECTED, &wl->status);
- 
+ 	WL_TRACE("Exit\n");
  	return err;
  }