Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 (c2a3b233) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/wireless/b43/main.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -4326,6 +4326,14 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
		err = -EOPNOTSUPP;
		goto err_powerdown;
		}
		if (1 /* disable A-PHY */) {
		/* FIXME: For now we disable the A-PHY on multi-PHY devices. */
		if (dev->phy.type != B43_PHYTYPE_N) {
		have_2ghz_phy = 1;
		have_5ghz_phy = 0;
		}
		}

		dev->phy.gmode = have_2ghz_phy;
		tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;
		b43_wireless_core_reset(dev, tmp);

drivers/net/wireless/libertas/scan.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -298,7 +298,8 @@ static int lbs_do_scan(struct lbs_private *priv, uint8_t bsstype,
		uint8_t tlv; / pointer into our current, growing TLV storage area */

		lbs_deb_enter_args(LBS_DEB_SCAN, "bsstype %d, chanlist[].chan %d, chan_count %d",
		bsstype, chan_list[0].channumber, chan_count);
		bsstype, chan_list ? chan_list[0].channumber : -1,
		chan_count);

		/* create the fixed part for scan command */
		scan_cmd = kzalloc(MAX_SCAN_CFG_ALLOC, GFP_KERNEL);

include/linux/ieee80211.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ struct ieee80211_hdr {
		struct ieee80211s_hdr {
		u8 flags;
		u8 ttl;
		u8 seqnum[3];
		__le32 seqnum;
		u8 eaddr1[6];
		u8 eaddr2[6];
		u8 eaddr3[6];

net/mac80211/ieee80211_i.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ struct ieee80211_if_sta {
		int preq_queue_len;
		struct mesh_stats mshstats;
		struct mesh_config mshcfg;
		u8 mesh_seqnum[3];
		u32 mesh_seqnum;
		bool accepting_plinks;
		#endif
		u16 aid;

net/mac80211/main.c

+29 −18

Original line number	Diff line number	Diff line
		@@ -255,22 +255,8 @@ static int ieee80211_open(struct net_device *dev)

		switch (sdata->vif.type) {
		case IEEE80211_IF_TYPE_WDS:
		if (is_zero_ether_addr(sdata->u.wds.remote_addr))
		if (!is_valid_ether_addr(sdata->u.wds.remote_addr))
		return -ENOLINK;

		/* Create STA entry for the WDS peer */
		sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
		GFP_KERNEL);
		if (!sta)
		return -ENOMEM;

		sta->flags \|= WLAN_STA_AUTHORIZED;

		res = sta_info_insert(sta);
		if (res) {
		/* STA has been freed */
		return res;
		}
		break;
		case IEEE80211_IF_TYPE_VLAN:
		if (!sdata->u.vlan.ap)
		@@ -337,10 +323,8 @@ static int ieee80211_open(struct net_device *dev)
		conf.type = sdata->vif.type;
		conf.mac_addr = dev->dev_addr;
		res = local->ops->add_interface(local_to_hw(local), &conf);
		if (res && !local->open_count && local->ops->stop)
		local->ops->stop(local_to_hw(local));
		if (res)
		return res;
		goto err_stop;

		ieee80211_if_config(dev);
		ieee80211_reset_erp_info(dev);
		@@ -353,9 +337,29 @@ static int ieee80211_open(struct net_device *dev)
		netif_carrier_on(dev);
		}

		if (sdata->vif.type == IEEE80211_IF_TYPE_WDS) {
		/* Create STA entry for the WDS peer */
		sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
		GFP_KERNEL);
		if (!sta) {
		res = -ENOMEM;
		goto err_del_interface;
		}

		sta->flags \|= WLAN_STA_AUTHORIZED;

		res = sta_info_insert(sta);
		if (res) {
		/* STA has been freed */
		goto err_del_interface;
		}
		}

		if (local->open_count == 0) {
		res = dev_open(local->mdev);
		WARN_ON(res);
		if (res)
		goto err_del_interface;
		tasklet_enable(&local->tx_pending_tasklet);
		tasklet_enable(&local->tasklet);
		}
		@@ -390,6 +394,12 @@ static int ieee80211_open(struct net_device *dev)
		netif_start_queue(dev);

		return 0;
		err_del_interface:
		local->ops->remove_interface(local_to_hw(local), &conf);
		err_stop:
		if (!local->open_count && local->ops->stop)
		local->ops->stop(local_to_hw(local));
		return res;
		}

		static int ieee80211_stop(struct net_device *dev)
		@@ -975,6 +985,7 @@ static int __ieee80211_if_config(struct net_device *dev,
		conf.ssid_len = sdata->u.sta.ssid_len;
		} else if (ieee80211_vif_is_mesh(&sdata->vif)) {
		conf.beacon = beacon;
		conf.beacon_control = control;
		ieee80211_start_mesh(dev);
		} else if (sdata->vif.type == IEEE80211_IF_TYPE_AP) {
		conf.ssid = sdata->u.ap.ssid;