kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 13 Aug 2013 23:00:30 +0000 (23:00 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 13 Aug 2013 23:00:30 +0000 (23:00 +0000)
Backport of r36378

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37768 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic/patches-3.3/721-phy_packets.patch

index 575fbae..cdb01be 100644 (file)
 +      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
 +