From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 13 Aug 2013 23:00:30 +0000 (+0000)
Subject: kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1f3b6d45e8c017a648235383fe2dfcabb4804a16;p=openwrt%2Fsvn-archive%2Farchive.git

kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL

Backport of r36378

SVN-Revision: 37768
---

diff --git a/target/linux/generic/patches-3.3/721-phy_packets.patch b/target/linux/generic/patches-3.3/721-phy_packets.patch
index 575fbaeaad..cdb01be100 100644
--- a/target/linux/generic/patches-3.3/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.3/721-phy_packets.patch
@@ -145,7 +145,7 @@
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+	if (dev->priv_flags & IFF_NO_IP_ALIGN)
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
 +		return skb;
 +#endif
 +