Staging: merge staging patches into Linus's main branch
Greg Kroah-Hartman [Thu, 4 Mar 2010 16:39:02 +0000 (08:39 -0800)]
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>

16 files changed:
1  2 
drivers/staging/et131x/et131x_netdev.c
drivers/staging/go7007/s2250-board.c
drivers/staging/hv/blkvsc_drv.c
drivers/staging/phison/phison.c
drivers/staging/rtl8187se/ieee80211/ieee80211.h
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8187se/r8180_core.c
drivers/staging/rtl8192su/ieee80211/ieee80211.h
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c
drivers/staging/rtl8192su/r8192U_core.c
drivers/staging/slicoss/slicoss.c
drivers/staging/sm7xx/smtcfb.c
drivers/staging/vt6655/device_main.c
drivers/staging/wlags49_h2/wl_netdev.c

Simple merge
Simple merge
Simple merge
@@@ -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;
  
  
  #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
                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");
  
@@@ -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);
  
Simple merge
Simple merge