aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-14 09:18:32 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-14 09:18:32 +0000
commitb472e5d12e5f607d1c9e93d53e35162c476e54dc (patch)
treea4d6ddead5e7cd3d28f53c4f8e19a878822e2bd8 /target/linux/generic
parenta243cb1735cd8f3adc77eeb490febd8b8989ca3f (diff)
downloadupstream-b472e5d12e5f607d1c9e93d53e35162c476e54dc.tar.gz
upstream-b472e5d12e5f607d1c9e93d53e35162c476e54dc.tar.bz2
upstream-b472e5d12e5f607d1c9e93d53e35162c476e54dc.zip
kernel: update linux 3.3 to 3.3.6
SVN-Revision: 31709
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.3/721-phy_packets.patch4
1 files changed, 2 insertions, 2 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 8efd21a6c7..99837e2f00 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
-@@ -2246,9 +2246,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2266,9 +2266,19 @@ int dev_hard_start_xmit(struct sk_buff *
}
}
@@ -102,7 +102,7 @@
if (rc == NETDEV_TX_OK)
txq_trans_update(txq);
return rc;
-@@ -2268,9 +2278,19 @@ gso:
+@@ -2288,9 +2298,19 @@ gso:
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
skb_dst_drop(nskb);