projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a56ae33
)
kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 22 Apr 2013 15:01:36 +0000
(15:01 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 22 Apr 2013 15:01:36 +0000
(15:01 +0000)
SVN-Revision: 36378
target/linux/generic/patches-3.3/721-phy_packets.patch
patch
|
blob
|
history
target/linux/generic/patches-3.6/721-phy_packets.patch
patch
|
blob
|
history
target/linux/generic/patches-3.7/721-phy_packets.patch
patch
|
blob
|
history
target/linux/generic/patches-3.8/721-phy_packets.patch
patch
|
blob
|
history
target/linux/generic/patches-3.9/721-phy_packets.patch
patch
|
blob
|
history
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 575fbaeaade9d170ed33b259512af85826c11656..cdb01be10029487cb5b578307c43b7f6a99bc377 100644
(file)
--- 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
+ 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
+
+ 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 3a0fdc95b36938d7374879da44156e24fe4b0afb..70b65a86bd018021ed918ff6a1cf80208277736f 100644
(file)
--- 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
+ 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
+
+ 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 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
+ 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
+
+ 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 d78ba8ed60a3ebc52a9e7d20ce342be0aed7cfb4..88b5969f395164e29ad71ac93a7734f7e0f2ae5b 100644
(file)
--- 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
+ 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
+
+ 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 65f5ffd2135f2787fa95fbc74f6cd94075288ce9..dbf105e74c9fa240d7e2bdedccb129d58a1199de 100644
(file)
--- 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
+ 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
+
+ return skb;
+#endif
+
projects / openwrt / svn-archive / archive.git / commitdiff