Merge 'misc-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (29c31a3b) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/e1000/e1000_main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2307,6 +2307,7 @@ e1000_xmit_frame(struct sk_buff skb, struct net_device netdev)
		tso = e1000_tso(adapter, skb);
		if (tso < 0) {
		dev_kfree_skb_any(skb);
		spin_unlock_irqrestore(&adapter->tx_lock, flags);
		return NETDEV_TX_OK;
		}