aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-12 17:49:01 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-12 17:49:01 +0000
commit88cda758c321f0b56556d425daca5c59066eb31a (patch)
tree49f8dc36553952cfaba9a6d83236d549db7191d7 /target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
parent9d0f42d50ad05f35801ff2c2bc9f05ecc7eb4b9b (diff)
downloadupstream-88cda758c321f0b56556d425daca5c59066eb31a.tar.gz
upstream-88cda758c321f0b56556d425daca5c59066eb31a.tar.bz2
upstream-88cda758c321f0b56556d425daca5c59066eb31a.zip
update to 2.6.25.20, 2.6.26.8, 2.6.27.5 and refresh patches * based on a patch by Hauke Mehrtens * closes #4193
SVN-Revision: 13192
Diffstat (limited to 'target/linux/atheros/patches-2.6.26/150-bridge-printk.patch')
-rw-r--r--target/linux/atheros/patches-2.6.26/150-bridge-printk.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
index 97b2ddf6b6..b5c80cdfc2 100644
--- a/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
+++ b/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
@@ -1,6 +1,6 @@
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -3786,8 +3786,8 @@ int register_netdevice(struct net_device
+@@ -3783,8 +3783,8 @@ int register_netdevice(struct net_device
/* Fix illegal SG+CSUM combinations. */
if ((dev->features & NETIF_F_SG) &&
!(dev->features & NETIF_F_ALL_CSUM)) {
@@ -11,7 +11,7 @@
dev->features &= ~NETIF_F_SG;
}
-@@ -3800,9 +3800,9 @@ int register_netdevice(struct net_device
+@@ -3797,9 +3797,9 @@ int register_netdevice(struct net_device
}
if (dev->features & NETIF_F_UFO) {
if (!(dev->features & NETIF_F_HW_CSUM)) {