aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-22 15:01:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-04-22 15:01:36 +0000
commita8a01b42ae36ce4d04b73802b2b8a347d3ee6ac3 (patch)
treeefbf4b9f72a4285e207c7648357773ce49dc62cc /target/linux/generic/patches-3.6
parentf99a208b4fc439044160b1e3525c2cfa3fdc1fb8 (diff)
downloadupstream-a8a01b42ae36ce4d04b73802b2b8a347d3ee6ac3.tar.gz
upstream-a8a01b42ae36ce4d04b73802b2b8a347d3ee6ac3.tar.bz2
upstream-a8a01b42ae36ce4d04b73802b2b8a347d3ee6ac3.zip
kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL
SVN-Revision: 36378
Diffstat (limited to 'target/linux/generic/patches-3.6')
-rw-r--r--target/linux/generic/patches-3.6/721-phy_packets.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.6/721-phy_packets.patch b/target/linux/generic/patches-3.6/721-phy_packets.patch
index 3a0fdc95b3..70b65a86bd 100644
--- a/target/linux/generic/patches-3.6/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.6/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
+