kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.7 / 721-phy_packets.patch

diff --git a/target/linux/generic/patches-3.7/721-phy_packets.patch b/target/linux/generic/patches-3.7/721-phy_packets.patch
index b8c15fcc6c51efd0091d1113aa3926df1ec7dc2e..78b2d69b474a2e25b551b100783a435db4b9d4f1 100644 (file)
--- a/target/linux/generic/patches-3.7/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.7/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
 +