From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 4 Mar 2010 16:39:02 +0000 (-0800)
Subject: Staging: merge staging patches into Linus's main branch
X-Git-Tag: v2.6.34-rc1~10^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f341dddf1dadf64be309791f83d7904245f1261d;p=linux.git

Staging: merge staging patches into Linus's main branch

There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch.  This merge resolves those merge conflicts.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

f341dddf1dadf64be309791f83d7904245f1261d
diff --cc drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
index 095b8c643146,67b99ad88475..cc80faf6598b
--- 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");
  
diff --cc drivers/staging/slicoss/slicoss.c
index f5cc01ba4145,37e518656afa..7daeced317c4
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@@ -1360,10 -1364,12 +1364,10 @@@ static void slic_mcast_set_bit(struct a
  
  static void slic_mcast_set_list(struct net_device *dev)
  {
- 	struct adapter *adapter = (struct adapter *)netdev_priv(dev);
+ 	struct adapter *adapter = netdev_priv(dev);
  	int status = STATUS_SUCCESS;
 -	int i;
  	char *addresses;
 -	struct dev_mc_list *mc_list = dev->mc_list;
 -	int mc_count = dev->mc_count;
 +	struct dev_mc_list *mc_list;
  
  	ASSERT(adapter);