Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

David S. Miller
2 parents a71fba9729 e79aa86710
Showing 19 changed files Side-by-side Diff
drivers/net/8139cp.c
drivers/net/8139too.c
drivers/net/gianfar.c
drivers/net/phy/lxt.c
drivers/net/r8169.c
drivers/net/usb/asix.c
drivers/net/wimax/i2400m/fw.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
include/linux/skbuff.h
net/8021q/vlan_core.c
net/caif/cfrfml.c
net/caif/cfveil.c
net/core/dev.c
net/core/gen_estimator.c
net/core/pktgen.c
net/ipv4/ipmr.c
net/ipv6/icmp.c
net/ipv6/ip6mr.c
net/mac80211/mlme.c
@@ -598,8 +598,8 @@
 			goto rx_status_loop;
  
 		spin_lock_irqsave(&cp->lock, flags);
-		cpw16_f(IntrMask, cp_intr_mask);
 		__napi_complete(napi);
+		cpw16_f(IntrMask, cp_intr_mask);
 		spin_unlock_irqrestore(&cp->lock, flags);
 	}
  
@@ -860,6 +860,7 @@
 		}
  
 	/* if unknown chip, assume array element #0, original RTL-8139 in this case */
+	i = 0;
 	dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n");
 	dev_dbg(&pdev->dev, "TxConfig = 0x%x\n", RTL_R32 (TxConfig));
 	tp->chipset = 0;
  
@@ -2088,8 +2089,8 @@
 		 * again when we think we are done.
 		 */
 		spin_lock_irqsave(&tp->lock, flags);
-		RTL_W16_F(IntrMask, rtl8139_intr_mask);
 		__napi_complete(napi);
+		RTL_W16_F(IntrMask, rtl8139_intr_mask);
 		spin_unlock_irqrestore(&tp->lock, flags);
 	}
 	spin_unlock(&tp->rx_lock);
@@ -747,8 +747,7 @@
 			FSL_GIANFAR_DEV_HAS_CSUM |
 			FSL_GIANFAR_DEV_HAS_VLAN |
 			FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
-			FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
-			FSL_GIANFAR_DEV_HAS_TIMER;
+			FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
  
 	ctype = of_get_property(np, "phy-connection-type", NULL);
  
@@ -53,6 +53,9 @@
  
 #define MII_LXT971_ISR		19  /* Interrupt Status Register */
  
+/* register definitions for the 973 */
+#define MII_LXT973_PCR 16 /* Port Configuration Register */
+#define PCR_FIBER_SELECT 1
  
 MODULE_DESCRIPTION("Intel LXT PHY driver");
 MODULE_AUTHOR("Andy Fleming");
@@ -119,6 +122,33 @@
 	return err;
 }
  
+static int lxt973_probe(struct phy_device *phydev)
+{
+	int val = phy_read(phydev, MII_LXT973_PCR);
+
+	if (val & PCR_FIBER_SELECT) {
+		/*
+		 * If fiber is selected, then the only correct setting
+		 * is 100Mbps, full duplex, and auto negotiation off.
+		 */
+		val = phy_read(phydev, MII_BMCR);
+		val |= (BMCR_SPEED100 | BMCR_FULLDPLX);
+		val &= ~BMCR_ANENABLE;
+		phy_write(phydev, MII_BMCR, val);
+		/* Remember that the port is in fiber mode. */
+		phydev->priv = lxt973_probe;
+	} else {
+		phydev->priv = NULL;
+	}
+	return 0;
+}
+
+static int lxt973_config_aneg(struct phy_device *phydev)
+{
+	/* Do nothing if port is in fiber mode. */
+	return phydev->priv ? 0 : genphy_config_aneg(phydev);
+}
+
 static struct phy_driver lxt970_driver = {
 	.phy_id		= 0x78100000,
 	.name		= "LXT970",
@@ -146,6 +176,18 @@
 	.driver 	= { .owner = THIS_MODULE,},
 };
  
+static struct phy_driver lxt973_driver = {
+	.phy_id		= 0x00137a10,
+	.name		= "LXT973",
+	.phy_id_mask	= 0xfffffff0,
+	.features	= PHY_BASIC_FEATURES,
+	.flags		= 0,
+	.probe		= lxt973_probe,
+	.config_aneg	= lxt973_config_aneg,
+	.read_status	= genphy_read_status,
+	.driver 	= { .owner = THIS_MODULE,},
+};
+
 static int __init lxt_init(void)
 {
 	int ret;
  
@@ -157,9 +199,15 @@
 	ret = phy_driver_register(&lxt971_driver);
 	if (ret)
 		goto err2;
+
+	ret = phy_driver_register(&lxt973_driver);
+	if (ret)
+		goto err3;
 	return 0;
  
- err2:	
+ err3:
+	phy_driver_unregister(&lxt971_driver);
+ err2:
 	phy_driver_unregister(&lxt970_driver);
  err1:
 	return ret;
@@ -169,6 +217,7 @@
 {
 	phy_driver_unregister(&lxt970_driver);
 	phy_driver_unregister(&lxt971_driver);
+	phy_driver_unregister(&lxt973_driver);
 }
  
 module_init(lxt_init);
@@ -560,10 +560,10 @@
 		udelay(25);
 	}
 	/*
-	 * Some configurations require a small delay even after the write
-	 * completed indication or the next write might fail.
+	 * According to hardware specs a 20us delay is required after write
+	 * complete indication, but before sending next command.
 	 */
-	udelay(25);
+	udelay(20);
 }
  
 static int mdio_read(void __iomem *ioaddr, int reg_addr)
@@ -583,6 +583,12 @@
 		}
 		udelay(25);
 	}
+	/*
+	 * According to hardware specs a 20us delay is required after read
+	 * complete indication, but before sending next command.
+	 */
+	udelay(20);
+
 	return value;
 }
  
@@ -344,7 +344,7 @@
 			return 2;
 		}
  
-		if (size > ETH_FRAME_LEN) {
+		if (size > dev->net->mtu + ETH_HLEN) {
 			netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
 				   size);
 			return 0;
@@ -1192,7 +1192,7 @@
 	unsigned module_type, header_len, major_version, minor_version,
 		module_id, module_vendor, date, size;
  
-	module_type = bcf_hdr->module_type;
+	module_type = le32_to_cpu(bcf_hdr->module_type);
 	header_len = sizeof(u32) * le32_to_cpu(bcf_hdr->header_len);
 	major_version = (le32_to_cpu(bcf_hdr->header_version) & 0xffff0000)
 		>> 16;
@@ -1147,6 +1147,7 @@
 	struct ieee80211_sta *sta;
 	struct iwl_station_priv *sta_priv;
  
+	rcu_read_lock();
 	sta = ieee80211_find_sta(priv->vif, hdr->addr1);
 	if (sta) {
 		sta_priv = (void *)sta->drv_priv;
@@ -1155,6 +1156,7 @@
 		    atomic_dec_return(&sta_priv->pending_frames) == 0)
 			ieee80211_sta_block_awake(priv->hw, sta, false);
 	}
+	rcu_read_unlock();
  
 	ieee80211_tx_status_irqsafe(priv->hw, skb);
 }
@@ -380,7 +380,10 @@
 	kmemcheck_bitfield_begin(flags2);
 	__u16			queue_mapping:16;
 #ifdef CONFIG_IPV6_NDISC_NODETYPE
-	__u8			ndisc_nodetype:2;
+	__u8			ndisc_nodetype:2,
+				deliver_no_wcard:1;
+#else
+	__u8			deliver_no_wcard:1;
 #endif
 	kmemcheck_bitfield_end(flags2);
  
@@ -12,7 +12,7 @@
 		return NET_RX_DROP;
  
 	if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
-		goto drop;
+		skb->deliver_no_wcard = 1;
  
 	skb->skb_iif = skb->dev->ifindex;
 	__vlan_hwaccel_put_tag(skb, vlan_tci);
@@ -84,7 +84,7 @@
 	struct sk_buff *p;
  
 	if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
-		goto drop;
+		skb->deliver_no_wcard = 1;
  
 	skb->skb_iif = skb->dev->ifindex;
 	__vlan_hwaccel_put_tag(skb, vlan_tci);
@@ -83,7 +83,7 @@
 	if (!cfsrvl_ready(service, &ret))
 		return ret;
  
-	if (!cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
+	if (cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
 		pr_err("CAIF: %s():Packet too large - size=%d\n",
 			__func__, cfpkt_getlen(pkt));
 		return -EOVERFLOW;
@@ -84,7 +84,7 @@
 		return ret;
 	caif_assert(layr->dn != NULL);
 	caif_assert(layr->dn->transmit != NULL);
-	if (!cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
+	if (cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
 		pr_warning("CAIF: %s(): Packet too large - size=%d\n",
 			   __func__, cfpkt_getlen(pkt));
 		return -EOVERFLOW;
@@ -2273,11 +2273,9 @@
 	if (skb_rx_queue_recorded(skb)) {
 		u16 index = skb_get_rx_queue(skb);
 		if (unlikely(index >= dev->num_rx_queues)) {
-			if (net_ratelimit()) {
-				pr_warning("%s received packet on queue "
-					"%u, but number of RX queues is %u\n",
-					dev->name, index, dev->num_rx_queues);
-			}
+			WARN_ONCE(dev->num_rx_queues > 1, "%s received packet "
+				"on queue %u, but number of RX queues is %u\n",
+				dev->name, index, dev->num_rx_queues);
 			goto done;
 		}
 		rxqueue = dev->_rx + index;
  
  
@@ -2815,13 +2813,24 @@
 	if (!skb->skb_iif)
 		skb->skb_iif = skb->dev->ifindex;
  
+	/*
+	 * bonding note: skbs received on inactive slaves should only
+	 * be delivered to pkt handlers that are exact matches.  Also
+	 * the deliver_no_wcard flag will be set.  If packet handlers
+	 * are sensitive to duplicate packets these skbs will need to
+	 * be dropped at the handler.  The vlan accel path may have
+	 * already set the deliver_no_wcard flag.
+	 */
 	null_or_orig = NULL;
 	orig_dev = skb->dev;
 	master = ACCESS_ONCE(orig_dev->master);
-	if (master) {
-		if (skb_bond_should_drop(skb, master))
+	if (skb->deliver_no_wcard)
+		null_or_orig = orig_dev;
+	else if (master) {
+		if (skb_bond_should_drop(skb, master)) {
+			skb->deliver_no_wcard = 1;
 			null_or_orig = orig_dev; /* deliver only exact match */
-		else
+		} else
 			skb->dev = master;
 	}
  
@@ -107,6 +107,7 @@
  
 /* Protects against soft lockup during large deletion */
 static struct rb_root est_root = RB_ROOT;
+static DEFINE_SPINLOCK(est_tree_lock);
  
 static void est_timer(unsigned long arg)
 {
@@ -201,7 +202,6 @@
  *
  * Returns 0 on success or a negative error code.
  *
- * NOTE: Called under rtnl_mutex
  */
 int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
 		      struct gnet_stats_rate_est *rate_est,
@@ -232,6 +232,7 @@
 	est->last_packets = bstats->packets;
 	est->avpps = rate_est->pps<<10;
  
+	spin_lock(&est_tree_lock);
 	if (!elist[idx].timer.function) {
 		INIT_LIST_HEAD(&elist[idx].list);
 		setup_timer(&elist[idx].timer, est_timer, idx);
@@ -242,6 +243,7 @@
  
 	list_add_rcu(&est->list, &elist[idx].list);
 	gen_add_node(est);
+	spin_unlock(&est_tree_lock);
  
 	return 0;
 }
  
@@ -261,13 +263,13 @@
  *
  * Removes the rate estimator specified by &bstats and &rate_est.
  *
- * NOTE: Called under rtnl_mutex
  */
 void gen_kill_estimator(struct gnet_stats_basic_packed *bstats,
 			struct gnet_stats_rate_est *rate_est)
 {
 	struct gen_estimator *e;
  
+	spin_lock(&est_tree_lock);
 	while ((e = gen_find_node(bstats, rate_est))) {
 		rb_erase(&e->node, &est_root);
  
@@ -278,6 +280,7 @@
 		list_del_rcu(&e->list);
 		call_rcu(&e->e_rcu, __gen_kill_estimator);
 	}
+	spin_unlock(&est_tree_lock);
 }
 EXPORT_SYMBOL(gen_kill_estimator);
  
  
@@ -312,9 +315,15 @@
 bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats,
 			  const struct gnet_stats_rate_est *rate_est)
 {
+	bool res;
+
 	ASSERT_RTNL();
  
-	return gen_find_node(bstats, rate_est) != NULL;
+	spin_lock(&est_tree_lock);
+	res = gen_find_node(bstats, rate_est) != NULL;
+	spin_unlock(&est_tree_lock);
+
+	return res;
 }
 EXPORT_SYMBOL(gen_estimator_active);
@@ -2170,7 +2170,7 @@
 	end_time = ktime_now();
  
 	pkt_dev->idle_acc += ktime_to_ns(ktime_sub(end_time, start_time));
-	pkt_dev->next_tx = ktime_add_ns(end_time, pkt_dev->delay);
+	pkt_dev->next_tx = ktime_add_ns(spin_until, pkt_dev->delay);
 }
  
 static inline void set_pkt_overhead(struct pktgen_dev *pkt_dev)
@@ -267,8 +267,10 @@
 {
 	struct mr_table *mrt, *next;
  
-	list_for_each_entry_safe(mrt, next, &net->ipv4.mr_tables, list)
+	list_for_each_entry_safe(mrt, next, &net->ipv4.mr_tables, list) {
+		list_del(&mrt->list);
 		kfree(mrt);
+	}
 	fib_rules_unregister(net->ipv4.mr_rules_ops);
 }
 #else
@@ -483,7 +483,7 @@
 			      np->tclass, NULL, &fl, (struct rt6_info*)dst,
 			      MSG_DONTWAIT, np->dontfrag);
 	if (err) {
-		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
+		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTERRORS);
 		ip6_flush_pending_frames(sk);
 		goto out_put;
 	}
@@ -565,7 +565,7 @@
 				np->dontfrag);
  
 	if (err) {
-		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
+		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTERRORS);
 		ip6_flush_pending_frames(sk);
 		goto out_put;
 	}
@@ -254,8 +254,10 @@
 {
 	struct mr6_table *mrt, *next;
  
-	list_for_each_entry_safe(mrt, next, &net->ipv6.mr6_tables, list)
+	list_for_each_entry_safe(mrt, next, &net->ipv6.mr6_tables, list) {
+		list_del(&mrt->list);
 		ip6mr_free_table(mrt);
+	}
 	fib_rules_unregister(net->ipv6.mr6_rules_ops);
 }
 #else
@@ -1760,9 +1760,45 @@
 	mutex_unlock(&ifmgd->mtx);
  
 	if (skb->len >= 24 + 2 /* mgmt + deauth reason */ &&
-	    (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH)
-		cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
+	    (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH) {
+		struct ieee80211_local *local = sdata->local;
+		struct ieee80211_work *wk;
  
+		mutex_lock(&local->work_mtx);
+		list_for_each_entry(wk, &local->work_list, list) {
+			if (wk->sdata != sdata)
+				continue;
+
+			if (wk->type != IEEE80211_WORK_ASSOC)
+				continue;
+
+			if (memcmp(mgmt->bssid, wk->filter_ta, ETH_ALEN))
+				continue;
+			if (memcmp(mgmt->sa, wk->filter_ta, ETH_ALEN))
+				continue;
+
+			/*
+			 * Printing the message only here means we can't
+			 * spuriously print it, but it also means that it
+			 * won't be printed when the frame comes in before
+			 * we even tried to associate or in similar cases.
+			 *
+			 * Ultimately, I suspect cfg80211 should print the
+			 * messages instead.
+			 */
+			printk(KERN_DEBUG
+			       "%s: deauthenticated from %pM (Reason: %u)\n",
+			       sdata->name, mgmt->bssid,
+			       le16_to_cpu(mgmt->u.deauth.reason_code));
+
+			list_del_rcu(&wk->list);
+			free_work(wk);
+			break;
+		}
+		mutex_unlock(&local->work_mtx);
+
+		cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
+	}
  out:
 	kfree_skb(skb);
 }
...	...	@@ -598,8 +598,8 @@
598	598	goto rx_status_loop;
599	599
600	600	spin_lock_irqsave(&cp->lock, flags);
601		- cpw16_f(IntrMask, cp_intr_mask);
602	601	__napi_complete(napi);
	602	+ cpw16_f(IntrMask, cp_intr_mask);
603	603	spin_unlock_irqrestore(&cp->lock, flags);
604	604	}
605	605
...	...	@@ -860,6 +860,7 @@
860	860	}
861	861
862	862	/* if unknown chip, assume array element #0, original RTL-8139 in this case */
	863	+ i = 0;
863	864	dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n");
864	865	dev_dbg(&pdev->dev, "TxConfig = 0x%x\n", RTL_R32 (TxConfig));
865	866	tp->chipset = 0;
866	867
...	...	@@ -2088,8 +2089,8 @@
2088	2089	* again when we think we are done.
2089	2090	*/
2090	2091	spin_lock_irqsave(&tp->lock, flags);
2091		- RTL_W16_F(IntrMask, rtl8139_intr_mask);
2092	2092	__napi_complete(napi);
	2093	+ RTL_W16_F(IntrMask, rtl8139_intr_mask);
2093	2094	spin_unlock_irqrestore(&tp->lock, flags);
2094	2095	}
2095	2096	spin_unlock(&tp->rx_lock);
...	...	@@ -747,8 +747,7 @@
747	747	FSL_GIANFAR_DEV_HAS_CSUM \|
748	748	FSL_GIANFAR_DEV_HAS_VLAN \|
749	749	FSL_GIANFAR_DEV_HAS_MAGIC_PACKET \|
750		- FSL_GIANFAR_DEV_HAS_EXTENDED_HASH \|
751		- FSL_GIANFAR_DEV_HAS_TIMER;
	750	+ FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
752	751
753	752	ctype = of_get_property(np, "phy-connection-type", NULL);
754	753
...	...	@@ -53,6 +53,9 @@
53	53
54	54	#define MII_LXT971_ISR 19 /* Interrupt Status Register */
55	55
	56	+/* register definitions for the 973 */
	57	+#define MII_LXT973_PCR 16 /* Port Configuration Register */
	58	+#define PCR_FIBER_SELECT 1
56	59
57	60	MODULE_DESCRIPTION("Intel LXT PHY driver");
58	61	MODULE_AUTHOR("Andy Fleming");
...	...	@@ -119,6 +122,33 @@
119	122	return err;
120	123	}
121	124
	125	+static int lxt973_probe(struct phy_device *phydev)
	126	+{
	127	+ int val = phy_read(phydev, MII_LXT973_PCR);
	128	+
	129	+ if (val & PCR_FIBER_SELECT) {
	130	+ /*
	131	+ * If fiber is selected, then the only correct setting
	132	+ * is 100Mbps, full duplex, and auto negotiation off.
	133	+ */
	134	+ val = phy_read(phydev, MII_BMCR);
	135	+ val \|= (BMCR_SPEED100 \| BMCR_FULLDPLX);
	136	+ val &= ~BMCR_ANENABLE;
	137	+ phy_write(phydev, MII_BMCR, val);
	138	+ /* Remember that the port is in fiber mode. */
	139	+ phydev->priv = lxt973_probe;
	140	+ } else {
	141	+ phydev->priv = NULL;
	142	+ }
	143	+ return 0;
	144	+}
	145	+
	146	+static int lxt973_config_aneg(struct phy_device *phydev)
	147	+{
	148	+ /* Do nothing if port is in fiber mode. */
	149	+ return phydev->priv ? 0 : genphy_config_aneg(phydev);
	150	+}
	151	+
122	152	static struct phy_driver lxt970_driver = {
123	153	.phy_id = 0x78100000,
124	154	.name = "LXT970",
...	...	@@ -146,6 +176,18 @@
146	176	.driver = { .owner = THIS_MODULE,},
147	177	};
148	178
	179	+static struct phy_driver lxt973_driver = {
	180	+ .phy_id = 0x00137a10,
	181	+ .name = "LXT973",
	182	+ .phy_id_mask = 0xfffffff0,
	183	+ .features = PHY_BASIC_FEATURES,
	184	+ .flags = 0,
	185	+ .probe = lxt973_probe,
	186	+ .config_aneg = lxt973_config_aneg,
	187	+ .read_status = genphy_read_status,
	188	+ .driver = { .owner = THIS_MODULE,},
	189	+};
	190	+
149	191	static int __init lxt_init(void)
150	192	{
151	193	int ret;
152	194
...	...	@@ -157,9 +199,15 @@
157	199	ret = phy_driver_register(&lxt971_driver);
158	200	if (ret)
159	201	goto err2;
	202	+
	203	+ ret = phy_driver_register(&lxt973_driver);
	204	+ if (ret)
	205	+ goto err3;
160	206	return 0;
161	207
162		- err2:
	208	+ err3:
	209	+ phy_driver_unregister(&lxt971_driver);
	210	+ err2:
163	211	phy_driver_unregister(&lxt970_driver);
164	212	err1:
165	213	return ret;
...	...	@@ -169,6 +217,7 @@
169	217	{
170	218	phy_driver_unregister(&lxt970_driver);
171	219	phy_driver_unregister(&lxt971_driver);
	220	+ phy_driver_unregister(&lxt973_driver);
172	221	}
173	222
174	223	module_init(lxt_init);
...	...	@@ -560,10 +560,10 @@
560	560	udelay(25);
561	561	}
562	562	/*
563		- * Some configurations require a small delay even after the write
564		- * completed indication or the next write might fail.
	563	+ * According to hardware specs a 20us delay is required after write
	564	+ * complete indication, but before sending next command.
565	565	*/
566		- udelay(25);
	566	+ udelay(20);
567	567	}
568	568
569	569	static int mdio_read(void __iomem *ioaddr, int reg_addr)
...	...	@@ -583,6 +583,12 @@
583	583	}
584	584	udelay(25);
585	585	}
	586	+ /*
	587	+ * According to hardware specs a 20us delay is required after read
	588	+ * complete indication, but before sending next command.
	589	+ */
	590	+ udelay(20);
	591	+
586	592	return value;
587	593	}
588	594
...	...	@@ -344,7 +344,7 @@
344	344	return 2;
345	345	}
346	346
347		- if (size > ETH_FRAME_LEN) {
	347	+ if (size > dev->net->mtu + ETH_HLEN) {
348	348	netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
349	349	size);
350	350	return 0;
...	...	@@ -1192,7 +1192,7 @@
1192	1192	unsigned module_type, header_len, major_version, minor_version,
1193	1193	module_id, module_vendor, date, size;
1194	1194
1195		- module_type = bcf_hdr->module_type;
	1195	+ module_type = le32_to_cpu(bcf_hdr->module_type);
1196	1196	header_len = sizeof(u32) * le32_to_cpu(bcf_hdr->header_len);
1197	1197	major_version = (le32_to_cpu(bcf_hdr->header_version) & 0xffff0000)
1198	1198	>> 16;
...	...	@@ -1147,6 +1147,7 @@
1147	1147	struct ieee80211_sta *sta;
1148	1148	struct iwl_station_priv *sta_priv;
1149	1149
	1150	+ rcu_read_lock();
1150	1151	sta = ieee80211_find_sta(priv->vif, hdr->addr1);
1151	1152	if (sta) {
1152	1153	sta_priv = (void *)sta->drv_priv;
...	...	@@ -1155,6 +1156,7 @@
1155	1156	atomic_dec_return(&sta_priv->pending_frames) == 0)
1156	1157	ieee80211_sta_block_awake(priv->hw, sta, false);
1157	1158	}
	1159	+ rcu_read_unlock();
1158	1160
1159	1161	ieee80211_tx_status_irqsafe(priv->hw, skb);
1160	1162	}
...	...	@@ -380,7 +380,10 @@
380	380	kmemcheck_bitfield_begin(flags2);
381	381	__u16 queue_mapping:16;
382	382	#ifdef CONFIG_IPV6_NDISC_NODETYPE
383		- __u8 ndisc_nodetype:2;
	383	+ __u8 ndisc_nodetype:2,
	384	+ deliver_no_wcard:1;
	385	+#else
	386	+ __u8 deliver_no_wcard:1;
384	387	#endif
385	388	kmemcheck_bitfield_end(flags2);
386	389
...	...	@@ -12,7 +12,7 @@
12	12	return NET_RX_DROP;
13	13
14	14	if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
15		- goto drop;
	15	+ skb->deliver_no_wcard = 1;
16	16
17	17	skb->skb_iif = skb->dev->ifindex;
18	18	__vlan_hwaccel_put_tag(skb, vlan_tci);
...	...	@@ -84,7 +84,7 @@
84	84	struct sk_buff *p;
85	85
86	86	if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
87		- goto drop;
	87	+ skb->deliver_no_wcard = 1;
88	88
89	89	skb->skb_iif = skb->dev->ifindex;
90	90	__vlan_hwaccel_put_tag(skb, vlan_tci);