aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-08-13 23:00:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-08-13 23:00:30 +0000
commit48aaf4f2818c3707e2a57ec6aa6f3db5ac79ac5e (patch)
treeaa2d14aea27a6d2d023797d68035def33a2a7689
parent4c1bfdf69de4eef149daff20f2991b1734529956 (diff)
downloadupstream-48aaf4f2818c3707e2a57ec6aa6f3db5ac79ac5e.tar.gz
upstream-48aaf4f2818c3707e2a57ec6aa6f3db5ac79ac5e.tar.bz2
upstream-48aaf4f2818c3707e2a57ec6aa6f3db5ac79ac5e.zip
kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL
Backport of r36378 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37768 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-3.3/721-phy_packets.patch2
1 files changed, 1 insertions, 1 deletions
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
+