aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
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
commit431e5b64bcff979a29bcce642205eaa5064f41d8 (patch)
tree109d7821dbb2debac368383a0cc0b25f494607b9 /target/linux
parent076d88f618886e5c076c7d25ef86e88df9920928 (diff)
downloadupstream-431e5b64bcff979a29bcce642205eaa5064f41d8.tar.gz
upstream-431e5b64bcff979a29bcce642205eaa5064f41d8.tar.bz2
upstream-431e5b64bcff979a29bcce642205eaa5064f41d8.zip
kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36378 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.3/721-phy_packets.patch2
-rw-r--r--target/linux/generic/patches-3.6/721-phy_packets.patch2
-rw-r--r--target/linux/generic/patches-3.7/721-phy_packets.patch2
-rw-r--r--target/linux/generic/patches-3.8/721-phy_packets.patch2
-rw-r--r--target/linux/generic/patches-3.9/721-phy_packets.patch2
5 files changed, 5 insertions, 5 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
+
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
+
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 b8c15fcc6c..78b2d69b47 100644
--- 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
+
diff --git a/target/linux/generic/patches-3.8/721-phy_packets.patch b/target/linux/generic/patches-3.8/721-phy_packets.patch
index d78ba8ed60..88b5969f39 100644
--- a/target/linux/generic/patches-3.8/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.8/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
+
diff --git a/target/linux/generic/patches-3.9/721-phy_packets.patch b/target/linux/generic/patches-3.9/721-phy_packets.patch
index 65f5ffd213..dbf105e74c 100644
--- a/target/linux/generic/patches-3.9/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.9/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
+