Merge branch 'upstream-fixes' into upstream (01d654d2) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/wireless/orinoco.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -757,7 +757,6 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
		if (datalen > IEEE80211_DATA_LEN + 12) {
		printk(KERN_DEBUG "%s: oversized monitor frame, "
		"data length = %d\n", dev->name, datalen);
		err = -EIO;
		stats->rx_length_errors++;
		goto update_stats;
		}
		@@ -766,8 +765,7 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
		if (!skb) {
		printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n",
		dev->name);
		err = -ENOMEM;
		goto drop;
		goto update_stats;
		}

		/* Copy the 802.11 header to the skb */