From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 May 2011 00:00:17 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.0-rc1~147
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=3f5785ec31adcb7cafa9135087297a38d9698cf8

Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
  bonding: documentation and code cleanup for resend_igmp
  bonding: prevent deadlock on slave store with alb mode (v3)
  net: hold rtnl again in dump callbacks
  Add Fujitsu 1000base-SX PCI ID to tg3
  bnx2x: protect sequence increment with mutex
  sch_sfq: fix peek() implementation
  isdn: netjet - blacklist Digium TDM400P
  via-velocity: don't annotate MAC registers as packed
  xen: netfront: hold RTNL when updating features.
  sctp: fix memory leak of the ASCONF queue when free asoc
  net: make dev_disable_lro use physical device if passed a vlan dev (v2)
  net: move is_vlan_dev into public header file (v2)
  bug.h: Fix build with CONFIG_PRINTK disabled.
  wireless: fix fatal kernel-doc error + warning in mac80211.h
  wireless: fix cfg80211.h new kernel-doc warnings
  iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
  dst: catch uninitialized metrics
  be2net: hash key for rss-config cmd not set
  bridge: initialize fake_rtable metrics
  net: fix __dst_destroy_metrics_generic()
  ...

Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
---

3f5785ec31adcb7cafa9135087297a38d9698cf8
diff --cc drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index e3b409bb9847,7aaf99cc3a7b..1827b0bf9201
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@@ -2863,20 -2627,17 +2863,20 @@@ 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;
  }