summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3/721-phy_packets.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-3.3/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.3/721-phy_packets.patch6
1 files changed, 3 insertions, 3 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 99837e2f0..cdb01be10 100644
--- a/target/linux/generic/patches-3.3/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.3/721-phy_packets.patch
@@ -79,7 +79,7 @@
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2266,9 +2266,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2267,9 +2267,19 @@ int dev_hard_start_xmit(struct sk_buff *
}
}
@@ -102,7 +102,7 @@
if (rc == NETDEV_TX_OK)
txq_trans_update(txq);
return rc;
-@@ -2288,9 +2298,19 @@ gso:
+@@ -2289,9 +2299,19 @@ gso:
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
skb_dst_drop(nskb);
@@ -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
+